Revert "rtnl: Add support for netdev event to link messages"
This reverts commit def12888c161e6fec0702e5ec9c3962846e3a21d.
As per discussion between Roopa Prabhu and David Ahern, it is
advisable that we instead have the code collect the setlink triggered
events into a bitmask emitted in the IFLA_EVENT netlink attribute.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/dev.c b/net/core/dev.c
index 7efb417..ef9fe60e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6840,7 +6840,7 @@
if (!dev->rtnl_link_ops ||
dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
- skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,
+ skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U,
GFP_KERNEL);
/*
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index b2bd4c9..58419da 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -944,7 +944,6 @@
+ nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_SWITCH_ID */
+ nla_total_size(IFNAMSIZ) /* IFLA_PHYS_PORT_NAME */
+ rtnl_xdp_size(dev) /* IFLA_XDP */
- + nla_total_size(4) /* IFLA_EVENT */
+ nla_total_size(1); /* IFLA_PROTO_DOWN */
}
@@ -1277,70 +1276,9 @@
return err;
}
-static int rtnl_fill_link_event(struct sk_buff *skb, unsigned long event)
-{
- u32 rtnl_event;
-
- switch (event) {
- case NETDEV_REBOOT:
- rtnl_event = IFLA_EVENT_REBOOT;
- break;
- case NETDEV_CHANGEMTU:
- rtnl_event = IFLA_EVENT_CHANGE_MTU;
- break;
- case NETDEV_CHANGEADDR:
- rtnl_event = IFLA_EVENT_CHANGE_ADDR;
- break;
- case NETDEV_CHANGENAME:
- rtnl_event = IFLA_EVENT_CHANGE_NAME;
- break;
- case NETDEV_FEAT_CHANGE:
- rtnl_event = IFLA_EVENT_FEAT_CHANGE;
- break;
- case NETDEV_BONDING_FAILOVER:
- rtnl_event = IFLA_EVENT_BONDING_FAILOVER;
- break;
- case NETDEV_POST_TYPE_CHANGE:
- rtnl_event = IFLA_EVENT_POST_TYPE_CHANGE;
- break;
- case NETDEV_NOTIFY_PEERS:
- rtnl_event = IFLA_EVENT_NOTIFY_PEERS;
- break;
- case NETDEV_CHANGEUPPER:
- rtnl_event = IFLA_EVENT_CHANGE_UPPER;
- break;
- case NETDEV_RESEND_IGMP:
- rtnl_event = IFLA_EVENT_RESEND_IGMP;
- break;
- case NETDEV_PRECHANGEMTU:
- rtnl_event = IFLA_EVENT_PRE_CHANGE_MTU;
- break;
- case NETDEV_CHANGEINFODATA:
- rtnl_event = IFLA_EVENT_CHANGE_INFO_DATA;
- break;
- case NETDEV_PRECHANGEUPPER:
- rtnl_event = IFLA_EVENT_PRE_CHANGE_UPPER;
- break;
- case NETDEV_CHANGELOWERSTATE:
- rtnl_event = IFLA_EVENT_CHANGE_LOWER_STATE;
- break;
- case NETDEV_UDP_TUNNEL_PUSH_INFO:
- rtnl_event = IFLA_EVENT_UDP_TUNNEL_PUSH_INFO;
- break;
- case NETDEV_CHANGE_TX_QUEUE_LEN:
- rtnl_event = IFLA_EVENT_CHANGE_TX_QUEUE_LEN;
- break;
- default:
- return 0;
- }
-
- return nla_put_u32(skb, IFLA_EVENT, rtnl_event);
-}
-
static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
int type, u32 pid, u32 seq, u32 change,
- unsigned int flags, u32 ext_filter_mask,
- unsigned long event)
+ unsigned int flags, u32 ext_filter_mask)
{
struct ifinfomsg *ifm;
struct nlmsghdr *nlh;
@@ -1389,9 +1327,6 @@
nla_put_u8(skb, IFLA_PROTO_DOWN, dev->proto_down))
goto nla_put_failure;
- if (rtnl_fill_link_event(skb, event))
- goto nla_put_failure;
-
if (rtnl_fill_link_ifmap(skb, dev))
goto nla_put_failure;
@@ -1526,7 +1461,6 @@
[IFLA_LINK_NETNSID] = { .type = NLA_S32 },
[IFLA_PROTO_DOWN] = { .type = NLA_U8 },
[IFLA_XDP] = { .type = NLA_NESTED },
- [IFLA_EVENT] = { .type = NLA_U32 },
};
static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
@@ -1685,7 +1619,7 @@
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, 0,
flags,
- ext_filter_mask, 0);
+ ext_filter_mask);
/* If we ran out of room on the first message,
* we're in trouble
*/
@@ -2776,7 +2710,7 @@
return -ENOBUFS;
err = rtnl_fill_ifinfo(nskb, dev, RTM_NEWLINK, NETLINK_CB(skb).portid,
- nlh->nlmsg_seq, 0, 0, ext_filter_mask, 0);
+ nlh->nlmsg_seq, 0, 0, ext_filter_mask);
if (err < 0) {
/* -EMSGSIZE implies BUG in if_nlmsg_size */
WARN_ON(err == -EMSGSIZE);
@@ -2848,8 +2782,7 @@
}
struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,
- unsigned int change,
- unsigned long event, gfp_t flags)
+ unsigned int change, gfp_t flags)
{
struct net *net = dev_net(dev);
struct sk_buff *skb;
@@ -2860,7 +2793,7 @@
if (skb == NULL)
goto errout;
- err = rtnl_fill_ifinfo(skb, dev, type, 0, 0, change, 0, 0, event);
+ err = rtnl_fill_ifinfo(skb, dev, type, 0, 0, change, 0, 0);
if (err < 0) {
/* -EMSGSIZE implies BUG in if_nlmsg_size() */
WARN_ON(err == -EMSGSIZE);
@@ -2881,25 +2814,18 @@
rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, flags);
}
-static void rtmsg_ifinfo_event(int type, struct net_device *dev,
- unsigned int change, unsigned long event,
- gfp_t flags)
+void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change,
+ gfp_t flags)
{
struct sk_buff *skb;
if (dev->reg_state != NETREG_REGISTERED)
return;
- skb = rtmsg_ifinfo_build_skb(type, dev, change, event, flags);
+ skb = rtmsg_ifinfo_build_skb(type, dev, change, flags);
if (skb)
rtmsg_ifinfo_send(skb, dev, flags);
}
-
-void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change,
- gfp_t flags)
-{
- rtmsg_ifinfo_event(type, dev, change, 0, flags);
-}
EXPORT_SYMBOL(rtmsg_ifinfo);
static int nlmsg_populate_fdb_fill(struct sk_buff *skb,
@@ -4206,7 +4132,7 @@
case NETDEV_CHANGELOWERSTATE:
case NETDEV_UDP_TUNNEL_PUSH_INFO:
case NETDEV_CHANGE_TX_QUEUE_LEN:
- rtmsg_ifinfo_event(RTM_NEWLINK, dev, 0, event, GFP_KERNEL);
+ rtmsg_ifinfo(RTM_NEWLINK, dev, 0, GFP_KERNEL);
break;
default:
break;