From 54b669c7ee4b74b3625acb4e9d8d0cd3d4e10d5a Mon Sep 17 00:00:00 2001 From: norly Date: Wed, 23 Jan 2019 02:54:41 +0100 Subject: [PATCH] Bump N_ELMCAN to avoid conflicts with future in-tree line disciplines. We can't go higher than 29 because of NR_LDISCS == 30 in Linux 5.0. We can't go lower than 28 because of N_NULL == 27 in Linux 5.0. --- module/attach-me.sh | 2 +- module/elmcan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/attach-me.sh b/module/attach-me.sh index d0c130c..2d8a24c 100755 --- a/module/attach-me.sh +++ b/module/attach-me.sh @@ -1,3 +1,3 @@ #!/bin/bash -sudo ldattach --debug --speed 38400 --eightbits --noparity --onestopbit --iflag -ICRNL,INLCR,-IXOFF 26 $@ +sudo ldattach --debug --speed 38400 --eightbits --noparity --onestopbit --iflag -ICRNL,INLCR,-IXOFF 29 $@ diff --git a/module/elmcan.c b/module/elmcan.c index d34d25f..494dceb 100644 --- a/module/elmcan.c +++ b/module/elmcan.c @@ -47,7 +47,7 @@ MODULE_AUTHOR("Max Staudt "); /* Line discipline ID number */ #ifndef N_ELMCAN -#define N_ELMCAN 26 +#define N_ELMCAN 29 #endif #define ELM327_CAN_CONFIG_SEND_SFF 0x8000 -- 2.30.2