OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8df66af
)
ppp: Fix PPPIOCUNBRIDGECHAN request number
author
Guillaume Nault
<gnault@redhat.com>
Sat, 19 Dec 2020 12:19:24 +0000
(13:19 +0100)
committer
Jakub Kicinski
<kuba@kernel.org>
Tue, 22 Dec 2020 01:36:48 +0000
(17:36 -0800)
PPPIOCGL2TPSTATS already uses 54. This shouldn't be a problem in
practice, but let's keep the logical decreasing assignment scheme.
Fixes:
4cf476ced45d
("ppp: add PPPIOCBRIDGECHAN and PPPIOCUNBRIDGECHAN ioctls")
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Link:
https://lore.kernel.org/r/e3a4c355e3820331d8e1fffef8522739aae58b57.1608380117.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/uapi/linux/ppp-ioctl.h
patch
|
blob
|
history
diff --git
a/include/uapi/linux/ppp-ioctl.h
b/include/uapi/linux/ppp-ioctl.h
index
8dbecb3
..
1cc5ce0
100644
(file)
--- a/
include/uapi/linux/ppp-ioctl.h
+++ b/
include/uapi/linux/ppp-ioctl.h
@@
-116,7
+116,7
@@
struct pppol2tp_ioc_stats {
#define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */
#define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)
#define PPPIOCBRIDGECHAN _IOW('t', 53, int) /* bridge one channel to another */
-#define PPPIOCUNBRIDGECHAN _IO('t', 5
4
) /* unbridge channel */
+#define PPPIOCUNBRIDGECHAN _IO('t', 5
2
) /* unbridge channel */
#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)
#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */