netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net] ppp: Fix PPPIOCUNBRIDGECHAN request number
@ 2020-12-19 12:19 Guillaume Nault
  2020-12-22  1:50 ` patchwork-bot+netdevbpf
  0 siblings, 1 reply; 2+ messages in thread
From: Guillaume Nault @ 2020-12-19 12:19 UTC (permalink / raw)
  To: David Miller, Jakub Kicinski; +Cc: netdev, Tom Parkin, James Chapman

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(-)

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!! */
-- 
2.21.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net] ppp: Fix PPPIOCUNBRIDGECHAN request number
  2020-12-19 12:19 [PATCH net] ppp: Fix PPPIOCUNBRIDGECHAN request number Guillaume Nault
@ 2020-12-22  1:50 ` patchwork-bot+netdevbpf
  0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2020-12-22  1:50 UTC (permalink / raw)
  To: Guillaume Nault; +Cc: davem, kuba, netdev, tparkin, jchapman

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



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-12-22  1:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-19 12:19 [PATCH net] ppp: Fix PPPIOCUNBRIDGECHAN request number Guillaume Nault
2020-12-22  1:50 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).