Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: Add info for NETDEV_CHANGEUPPER event

Browse source 
Some consumers of NETDEV_CHANGEUPPER event would like to know which
upper device was linked/unlinked and what operation was carried.

Add information in the notifier info block for that purpose.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Matan Barak 2015-07-30 18:33:23 +03:00 • committed by Doug Ledford
parent 399e6f9581
commit 816dd19b3d
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/linux/netdevice.h
View file

@ -3556,6 +3556,20 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb, struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
netdev_features_t features); netdev_features_t features);
enum netdev_changeupper_event {
NETDEV_CHANGEUPPER_LINK,
NETDEV_CHANGEUPPER_UNLINK,
};
struct netdev_changeupper_info {
struct netdev_notifier_info info; /* must be first */
enum netdev_changeupper_event event;
struct net_device *upper;
};
void netdev_changeupper_info_change(struct net_device *dev,
struct netdev_changeupper_info *info);
struct netdev_bonding_info { struct netdev_bonding_info {
ifslave slave; ifslave slave;
ifbond master; ifbond master;

12
net/core/dev.c
View file

@ -5302,6 +5302,7 @@ static int __netdev_upper_dev_link(struct net_device *dev,
void *private) void *private)
{ {
struct netdev_adjacent *i, *j, *to_i, *to_j; struct netdev_adjacent *i, *j, *to_i, *to_j;
struct netdev_changeupper_info changeupper_info;
int ret = 0; int ret = 0;
ASSERT_RTNL(); ASSERT_RTNL();
@ -5357,7 +5358,10 @@ static int __netdev_upper_dev_link(struct net_device *dev,
goto rollback_lower_mesh; goto rollback_lower_mesh;
} }
call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); changeupper_info.event = NETDEV_CHANGEUPPER_LINK;
changeupper_info.upper = upper_dev;
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
return 0; return 0;
rollback_lower_mesh: rollback_lower_mesh:
@ -5453,6 +5457,7 @@ void netdev_upper_dev_unlink(struct net_device *dev,
struct net_device *upper_dev) struct net_device *upper_dev)
{ {
struct netdev_adjacent *i, *j; struct netdev_adjacent *i, *j;
struct netdev_changeupper_info changeupper_info;
ASSERT_RTNL(); ASSERT_RTNL();
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
@ -5474,7 +5479,10 @@ void netdev_upper_dev_unlink(struct net_device *dev,
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev); __netdev_adjacent_dev_unlink(dev, i->dev);
call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); changeupper_info.event = NETDEV_CHANGEUPPER_UNLINK;
changeupper_info.upper = upper_dev;
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
} }
EXPORT_SYMBOL(netdev_upper_dev_unlink); EXPORT_SYMBOL(netdev_upper_dev_unlink);