| Message ID | e3a4c355e3820331d8e1fffef8522739aae58b57.1608380117.git.gnault@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net] ppp: Fix PPPIOCUNBRIDGECHAN request number | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Sat, 19 Dec 2020 13:19:24 +0100 you wrote: > 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> > --- > > [...] Here is the summary with links: - [net] ppp: Fix PPPIOCUNBRIDGECHAN request number https://git.kernel.org/netdev/net/c/bcce55f556e8 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
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!! */
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> --- Original patch was committed to net-next just 9 days ago. It isn't part of any released kernel yet. So it should be safe to apply this change. include/uapi/linux/ppp-ioctl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)