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.

diff --git a/module/attach-me.sh b/module/attach-me.sh
index d0c130c34a4cba3ed6cbabfc17429bdeee889a48..2d8a24cfaa71ab1c45a031d62a735baad5f58b9b 100755 (executable)
--- 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 d34d25faf35c14dbc98bbf3ff606d3f028573582..494dceb445f885b1020ce183e41d3c8febb30ac2 100644 (file)
--- a/module/elmcan.c
+++ b/module/elmcan.c
@@ -47,7 +47,7 @@ MODULE_AUTHOR("Max Staudt <max-linux@enpas.org>");
 
 /* Line discipline ID number */
 #ifndef N_ELMCAN
-#define N_ELMCAN 26
+#define N_ELMCAN 29
 #endif
 
 #define ELM327_CAN_CONFIG_SEND_SFF           0x8000