summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGuillaume Nault <gnault@redhat.com>2020-12-19 13:19:24 +0100
committerJakub Kicinski <kuba@kernel.org>2020-12-22 02:36:48 +0100
commitbcce55f556e824d43f352d76b94509185585e38d (patch)
treee82f1fefb9ce7fc86a03996a860e765b4be04b2c /include
parentatm: idt77252: call pci_disable_device() on error path (diff)
downloadlinux-bcce55f556e824d43f352d76b94509185585e38d.tar.xz
linux-bcce55f556e824d43f352d76b94509185585e38d.zip
ppp: Fix PPPIOCUNBRIDGECHAN request number
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>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/ppp-ioctl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/ppp-ioctl.h b/include/uapi/linux/ppp-ioctl.h
index 8dbecb3ad036..1cc5ce0ae062 100644
--- 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', 54) /* unbridge channel */
+#define PPPIOCUNBRIDGECHAN _IO('t', 52) /* unbridge channel */
#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)
#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */