diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 | ||||
-rw-r--r-- | drivers/net/macvlan.c | 2 | ||||
-rw-r--r-- | drivers/net/vxlan.c | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 4e2aa47193cb..1c0efcb7920f 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -7002,7 +7002,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], | |||
7002 | return err; | 7002 | return err; |
7003 | } | 7003 | } |
7004 | 7004 | ||
7005 | static int ixgbe_ndo_fdb_del(struct ndmsg *ndm, | 7005 | static int ixgbe_ndo_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], |
7006 | struct net_device *dev, | 7006 | struct net_device *dev, |
7007 | const unsigned char *addr) | 7007 | const unsigned char *addr) |
7008 | { | 7008 | { |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 937bcc3d3212..5088dc5c3d1a 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |||
@@ -1959,6 +1959,7 @@ static int mlx4_en_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], | |||
1959 | } | 1959 | } |
1960 | 1960 | ||
1961 | static int mlx4_en_fdb_del(struct ndmsg *ndm, | 1961 | static int mlx4_en_fdb_del(struct ndmsg *ndm, |
1962 | struct nlattr *tb[], | ||
1962 | struct net_device *dev, | 1963 | struct net_device *dev, |
1963 | const unsigned char *addr) | 1964 | const unsigned char *addr) |
1964 | { | 1965 | { |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index b745194391a1..b95316831587 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -247,8 +247,8 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p) | |||
247 | return 0; | 247 | return 0; |
248 | } | 248 | } |
249 | 249 | ||
250 | static int qlcnic_fdb_del(struct ndmsg *ndm, struct net_device *netdev, | 250 | static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], |
251 | const unsigned char *addr) | 251 | struct net_device *netdev, const unsigned char *addr) |
252 | { | 252 | { |
253 | struct qlcnic_adapter *adapter = netdev_priv(netdev); | 253 | struct qlcnic_adapter *adapter = netdev_priv(netdev); |
254 | int err = -EOPNOTSUPP; | 254 | int err = -EOPNOTSUPP; |
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index e4b8078e88a9..defcd8a85744 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -599,7 +599,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], | |||
599 | return err; | 599 | return err; |
600 | } | 600 | } |
601 | 601 | ||
602 | static int macvlan_fdb_del(struct ndmsg *ndm, | 602 | static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], |
603 | struct net_device *dev, | 603 | struct net_device *dev, |
604 | const unsigned char *addr) | 604 | const unsigned char *addr) |
605 | { | 605 | { |
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 72485b9b9005..9d70421cf3a0 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c | |||
@@ -393,7 +393,8 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], | |||
393 | } | 393 | } |
394 | 394 | ||
395 | /* Delete entry (via netlink) */ | 395 | /* Delete entry (via netlink) */ |
396 | static int vxlan_fdb_delete(struct ndmsg *ndm, struct net_device *dev, | 396 | static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], |
397 | struct net_device *dev, | ||
397 | const unsigned char *addr) | 398 | const unsigned char *addr) |
398 | { | 399 | { |
399 | struct vxlan_dev *vxlan = netdev_priv(dev); | 400 | struct vxlan_dev *vxlan = netdev_priv(dev); |