From 85c7d734c77f9732272cced788693f84d430c3df Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 31 Oct 2025 07:58:52 +0000 Subject: [PATCH] Revert "net: rtnetlink: add msg kind names" This reverts commit a8b1eeb93184e976ef32537862f9f727a2f1ed96 which is commit 12dc5c2cb7b269c5a1c6d02844f40bfce942a7a6 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I780457e01724f9a48db68aefe4cd71a6628174e0 Signed-off-by: Greg Kroah-Hartman --- include/net/rtnetlink.h | 7 ------- net/core/rtnetlink.c | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index f436c4f6e031..c57da2d92368 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h @@ -13,13 +13,6 @@ enum rtnl_link_flags { RTNL_FLAG_DOIT_UNLOCKED = 1, }; -enum rtnl_kinds { - RTNL_KIND_NEW, - RTNL_KIND_DEL, - RTNL_KIND_GET, - RTNL_KIND_SET -}; - void rtnl_register(int protocol, int msgtype, rtnl_doit_func, rtnl_dumpit_func, unsigned int flags); int rtnl_register_module(struct module *owner, int protocol, int msgtype, diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 2cdb07dd263b..f1338734c2ee 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -5193,11 +5193,11 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, { struct net *net = sock_net(skb->sk); struct rtnl_link *link; - enum rtnl_kinds kind; struct module *owner; int err = -EOPNOTSUPP; rtnl_doit_func doit; unsigned int flags; + int kind; int family; int type; @@ -5214,11 +5214,11 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, family = ((struct rtgenmsg *)nlmsg_data(nlh))->rtgen_family; kind = type&3; - if (kind != RTNL_KIND_GET && !netlink_net_capable(skb, CAP_NET_ADMIN)) + if (kind != 2 && !netlink_net_capable(skb, CAP_NET_ADMIN)) return -EPERM; rcu_read_lock(); - if (kind == RTNL_KIND_GET && (nlh->nlmsg_flags & NLM_F_DUMP)) { + if (kind == 2 && nlh->nlmsg_flags&NLM_F_DUMP) { struct sock *rtnl; rtnl_dumpit_func dumpit; u16 min_dump_alloc = 0;