diff options
| author | norly <ny-git@enpas.org> | 2019-01-23 02:54:41 +0100 |
|---|---|---|
| committer | norly <ny-git@enpas.org> | 2019-01-23 15:53:00 +0100 |
| commit | 54b669c7ee4b74b3625acb4e9d8d0cd3d4e10d5a (patch) | |
| tree | cce438eea9f5e4797db12e75bdfe234ca6290158 /module | |
| parent | f5e5130a925e13b0bec9a53290a6245d3f33c71b (diff) | |
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.
Diffstat (limited to 'module')
| -rwxr-xr-x | module/attach-me.sh | 2 | ||||
| -rw-r--r-- | 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 <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 |