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

Commit f6f6424b authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del 



Do the work of parsing NDA_VLAN directly in rtnetlink code, pass simple
u16 vid to drivers from there.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93859b13

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -7536,7 +7536,7 @@ static int i40e_get_phys_port_id(struct net_device *netdev, 
 */

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

			    struct net_device *dev,

			    const unsigned char *addr,

			    const unsigned char *addr, u16 vid,

			    u16 flags)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

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

+2 −2
Original line number Diff line number Diff line
@@ -7708,7 +7708,7 @@ static int ixgbe_set_features(struct net_device *netdev, 


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

			     struct net_device *dev,

			     const unsigned char *addr,

			     const unsigned char *addr, u16 vid,

			     u16 flags)

{

	/* guarantee we can provide a unique filter for the unicast address */
@@ -7717,7 +7717,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
			return -ENOMEM;

	}



	return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags);

	return ndo_dflt_fdb_add(ndm, tb, dev, addr, vid, flags);

}



static int ixgbe_ndo_bridge_setlink(struct net_device *dev,

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

+5 −4
Original line number Diff line number Diff line
@@ -376,13 +376,14 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p) 
}



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

			struct net_device *netdev, const unsigned char *addr)

			struct net_device *netdev,

			const unsigned char *addr, u16 vid)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int err = -EOPNOTSUPP;



	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_del(ndm, tb, netdev, addr);

		return ndo_dflt_fdb_del(ndm, tb, netdev, addr, vid);



	if ((adapter->flags & QLCNIC_ESWITCH_ENABLED) ||

	    qlcnic_sriov_check(adapter)) {
@@ -401,13 +402,13 @@ static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], 


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

			struct net_device *netdev,

			const unsigned char *addr, u16 flags)

			const unsigned char *addr, u16 vid, u16 flags)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int err = 0;



	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_add(ndm, tb, netdev, addr, flags);

		return ndo_dflt_fdb_add(ndm, tb, netdev, addr, vid, flags);



	if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED) &&

	    !qlcnic_sriov_check(adapter)) {

drivers/net/macvlan.c

+2 −2
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static int macvlan_vlan_rx_kill_vid(struct net_device *dev, 


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

			   struct net_device *dev,

			   const unsigned char *addr,

			   const unsigned char *addr, u16 vid,

			   u16 flags)

{

	struct macvlan_dev *vlan = netdev_priv(dev);
@@ -898,7 +898,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 


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

			   struct net_device *dev,

			   const unsigned char *addr)

			   const unsigned char *addr, u16 vid)

{

	struct macvlan_dev *vlan = netdev_priv(dev);

	int err = -EINVAL;

drivers/net/vxlan.c

+2 −2
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, 
/* Add static entry (via netlink) */

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

			 struct net_device *dev,

			 const unsigned char *addr, u16 flags)

			 const unsigned char *addr, u16 vid, u16 flags)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	/* struct net *net = dev_net(vxlan->dev); */
@@ -885,7 +885,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
/* Delete entry (via netlink) */

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

			    struct net_device *dev,

			    const unsigned char *addr)

			    const unsigned char *addr, u16 vid)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct vxlan_fdb *f;