Commit 5dd6da25 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vxlan_fdb_delete-extack' 



Alaa Mohamed says:

====================
propagate extack to vxlan_fdb_delete

In order to propagate extack to vxlan_fdb_delete and vxlan_fdb_parse,
add extack to .ndo_fdb_del and edit all fdb del handelers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6da3c472 e92695e5

drivers/net/ethernet/intel/ice/ice_main.c

+2 −1
Original line number Diff line number Diff line
@@ -5688,11 +5688,12 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], 
 * @dev: the net device pointer

 * @addr: the MAC address entry being added

 * @vid: VLAN ID

 * @extack: netlink extended ack

 */

static int

ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],

	    struct net_device *dev, const unsigned char *addr,

	    __always_unused u16 vid)

	    __always_unused u16 vid, struct netlink_ext_ack *extack)

{

	int err;

drivers/net/ethernet/mscc/ocelot_net.c

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


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

			       struct net_device *dev,

			       const unsigned char *addr, u16 vid)

			       const unsigned char *addr, u16 vid,

				   struct netlink_ext_ack *extack)

{

	struct ocelot_port_private *priv = netdev_priv(dev);

	struct ocelot_port *ocelot_port = &priv->port;

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

+2 −1
Original line number Diff line number Diff line
@@ -368,7 +368,8 @@ 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, u16 vid)

			const unsigned char *addr, u16 vid,

			struct netlink_ext_ack *extack)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int err = -EOPNOTSUPP;

drivers/net/macvlan.c

+2 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,8 @@ 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, u16 vid)

			   const unsigned char *addr, u16 vid,

			   struct netlink_ext_ack *extack)

{

	struct macvlan_dev *vlan = netdev_priv(dev);

	int err = -EINVAL;

drivers/net/vxlan/vxlan_core.c

+29 −12
Original line number Diff line number Diff line
@@ -1129,19 +1129,25 @@ static void vxlan_fdb_dst_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f, 


static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,

			   union vxlan_addr *ip, __be16 *port, __be32 *src_vni,

			   __be32 *vni, u32 *ifindex, u32 *nhid)

			   __be32 *vni, u32 *ifindex, u32 *nhid,

			   struct netlink_ext_ack *extack)

{

	struct net *net = dev_net(vxlan->dev);

	int err;



	if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] ||

	    tb[NDA_PORT]))

	    tb[NDA_PORT])) {

			NL_SET_ERR_MSG(extack,

						  "DST, VNI, ifindex and port are mutually exclusive with NH_ID");

			return -EINVAL;

		}



	if (tb[NDA_DST]) {

		err = vxlan_nla_get_addr(ip, tb[NDA_DST]);

		if (err)

		if (err) {

			NL_SET_ERR_MSG(extack, "Unsupported address family");

			return err;

		}

	} else {

		union vxlan_addr *remote = &vxlan->default_dst.remote_ip;
@@ -1157,24 +1163,30 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, 
	}



	if (tb[NDA_PORT]) {

		if (nla_len(tb[NDA_PORT]) != sizeof(__be16))

		if (nla_len(tb[NDA_PORT]) != sizeof(__be16)) {

			NL_SET_ERR_MSG(extack, "Invalid vxlan port");

			return -EINVAL;

		}

		*port = nla_get_be16(tb[NDA_PORT]);

	} else {

		*port = vxlan->cfg.dst_port;

	}



	if (tb[NDA_VNI]) {

		if (nla_len(tb[NDA_VNI]) != sizeof(u32))

		if (nla_len(tb[NDA_VNI]) != sizeof(u32)) {

			NL_SET_ERR_MSG(extack, "Invalid vni");

			return -EINVAL;

		}

		*vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));

	} else {

		*vni = vxlan->default_dst.remote_vni;

	}



	if (tb[NDA_SRC_VNI]) {

		if (nla_len(tb[NDA_SRC_VNI]) != sizeof(u32))

		if (nla_len(tb[NDA_SRC_VNI]) != sizeof(u32)) {

			NL_SET_ERR_MSG(extack, "Invalid src vni");

			return -EINVAL;

		}

		*src_vni = cpu_to_be32(nla_get_u32(tb[NDA_SRC_VNI]));

	} else {

		*src_vni = vxlan->default_dst.remote_vni;
@@ -1183,12 +1195,16 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, 
	if (tb[NDA_IFINDEX]) {

		struct net_device *tdev;



		if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32))

		if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32)) {

			NL_SET_ERR_MSG(extack, "Invalid ifindex");

			return -EINVAL;

		}

		*ifindex = nla_get_u32(tb[NDA_IFINDEX]);

		tdev = __dev_get_by_index(net, *ifindex);

		if (!tdev)

		if (!tdev) {

			NL_SET_ERR_MSG(extack, "Device not found");

			return -EADDRNOTAVAIL;

		}

	} else {

		*ifindex = 0;

	}
@@ -1226,7 +1242,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
		return -EINVAL;



	err = vxlan_fdb_parse(tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex,

			      &nhid);

			      &nhid, extack);

	if (err)

		return err;
@@ -1280,7 +1296,8 @@ int __vxlan_fdb_delete(struct vxlan_dev *vxlan, 
/* Delete entry (via netlink) */

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

			    struct net_device *dev,

			    const unsigned char *addr, u16 vid)

			    const unsigned char *addr, u16 vid,

				struct netlink_ext_ack *extack)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	union vxlan_addr ip;
@@ -1291,7 +1308,7 @@ static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], 
	int err;



	err = vxlan_fdb_parse(tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex,

			      &nhid);

			      &nhid, extack);

	if (err)

		return err;