Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1690be63 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

bridge: Add vlan support to static neighbors 



When a user adds bridge neighbors, allow him to specify VLAN id.
If the VLAN id is not specified, the neighbor will be added
for VLANs currently in the ports filter list.  If no VLANs are
configured on the port, we use vlan 0 and only add 1 entry.

Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Acked-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0e9a30d

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -7002,7 +7002,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	return err;

}



static int ixgbe_ndo_fdb_del(struct ndmsg *ndm,

static int ixgbe_ndo_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],

			     struct net_device *dev,

			     const unsigned char *addr)

{

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+1 −0
Original line number Diff line number Diff line
@@ -1959,6 +1959,7 @@ static int mlx4_en_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
}



static int mlx4_en_fdb_del(struct ndmsg *ndm,

			   struct nlattr *tb[],

			   struct net_device *dev,

			   const unsigned char *addr)

{

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+2 −2
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p) 
	return 0;

}



static int qlcnic_fdb_del(struct ndmsg *ndm, struct net_device *netdev,

			const unsigned char *addr)

static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],

			struct net_device *netdev, const unsigned char *addr)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int err = -EOPNOTSUPP;

drivers/net/macvlan.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	return err;

}



static int macvlan_fdb_del(struct ndmsg *ndm,

static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],

			   struct net_device *dev,

			   const unsigned char *addr)

{

drivers/net/vxlan.c

+2 −1
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
}



/* Delete entry (via netlink) */

static int vxlan_fdb_delete(struct ndmsg *ndm, struct net_device *dev,

static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],

			    struct net_device *dev,

			    const unsigned char *addr)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);