diff options
| author |   Jiri Pirko <jiri@mellanox.com> | 2015-12-03 12:12:10 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-03 11:49:25 -0500 |
| commit | 6dffb0447c25476f499d205dfceb1972e8dae919 (patch) | |
| tree | 5f74b59c691acc6de6310aaa9a238da8fc6cdf25 /include/linux/netdevice.h | |
| parent | net: add netif_is_lag_port helper (diff) | |
| download | linux-dev-6dffb0447c25476f499d205dfceb1972e8dae919.tar.xz linux-dev-6dffb0447c25476f499d205dfceb1972e8dae919.zip | |
net: propagate upper priv via netdev_master_upper_dev_link
Eliminate netdev_master_upper_dev_link_private and pass priv directly as
a parameter of netdev_master_upper_dev_link.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1506be58c59a..939b8f3de810 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3619,10 +3619,8 @@ struct net_device *netdev_master_upper_dev_get(struct net_device *dev); struct net_device *netdev_master_upper_dev_get_rcu(struct net_device *dev); int netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev); int netdev_master_upper_dev_link(struct net_device *dev, - struct net_device *upper_dev); -int netdev_master_upper_dev_link_private(struct net_device *dev, - struct net_device *upper_dev, - void *private); + struct net_device *upper_dev, + void *upper_priv); void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev); void netdev_adjacent_rename_links(struct net_device *dev, char *oldname); |