Re: [PATCH net-next 12/18] switchdev: remove unused netdev_switch_port_bridge_dellink

[roopa <roopa@cumulusnetworks.com>]

On 3/30/15, 1:40 AM, sfeldma@gmail.com wrote:
> From: Scott Feldman <sfeldma@gmail.com>
>
> There are no port driver using bridge_dellink, so remove these swdev wrappers.
> Something was fishy here anyway because dellink isn't used for deleting port
> attributes (not sure how you delete a port attribute?).  VLAN deletes are
> already handled via ndo_vlan_rx_add_vid/ndo_vlan_rx_kill_vid.
>
> Signed-off-by: Scott Feldman <sfeldma@gmail.com>
dellink is used for vlan deletes in the new bridge vlan filtering bridge.

> ---
>   drivers/net/bonding/bond_main.c |    1 -
>   drivers/net/team/team.c         |    1 -
>   include/net/switchdev.h         |   18 -------------
>   net/bridge/br_netlink.c         |   12 +--------
>   net/switchdev/switchdev.c       |   55 ---------------------------------------
>   5 files changed, 1 insertion(+), 86 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 99ab282..9d823b6 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -4037,7 +4037,6 @@ static const struct net_device_ops bond_netdev_ops = {
>   	.ndo_del_slave		= bond_release,
>   	.ndo_fix_features	= bond_fix_features,
>   	.ndo_bridge_setlink	= swdev_port_bridge_setlink,
> -	.ndo_bridge_dellink	= ndo_dflt_netdev_switch_port_bridge_dellink,
>   	.ndo_features_check	= passthru_features_check,
>   };
>   
> diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
> index 6a3debc..101b341 100644
> --- a/drivers/net/team/team.c
> +++ b/drivers/net/team/team.c
> @@ -1978,7 +1978,6 @@ static const struct net_device_ops team_netdev_ops = {
>   	.ndo_fix_features	= team_fix_features,
>   	.ndo_change_carrier     = team_change_carrier,
>   	.ndo_bridge_setlink	= swdev_port_bridge_setlink,
> -	.ndo_bridge_dellink     = ndo_dflt_netdev_switch_port_bridge_dellink,
>   	.ndo_features_check	= passthru_features_check,
>   };
>   
> diff --git a/include/net/switchdev.h b/include/net/switchdev.h
> index bad2ec7..97196ab 100644
> --- a/include/net/switchdev.h
> +++ b/include/net/switchdev.h
> @@ -92,10 +92,6 @@ int register_netdev_switch_notifier(struct notifier_block *nb);
>   int unregister_netdev_switch_notifier(struct notifier_block *nb);
>   int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
>   				 struct netdev_switch_notifier_info *info);
> -int netdev_switch_port_bridge_dellink(struct net_device *dev,
> -				struct nlmsghdr *nlh, u16 flags);
> -int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> -					       struct nlmsghdr *nlh, u16 flags);
>   int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
>   			       u8 tos, u8 type, u32 nlflags, u32 tb_id);
>   int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
> @@ -138,20 +134,6 @@ static inline int call_netdev_switch_notifiers(unsigned long val, struct net_dev
>   	return NOTIFY_DONE;
>   }
>   
> -static inline int netdev_switch_port_bridge_dellink(struct net_device *dev,
> -						    struct nlmsghdr *nlh,
> -						    u16 flags)
> -{
> -	return -EOPNOTSUPP;
> -}
> -
> -static inline int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> -							struct nlmsghdr *nlh,
> -							u16 flags)
> -{
> -	return 0;
> -}
> -
>   static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len,
>   					     struct fib_info *fi,
>   					     u8 tos, u8 type,
> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
> index 5deb063..cfee027 100644
> --- a/net/bridge/br_netlink.c
> +++ b/net/bridge/br_netlink.c
> @@ -639,7 +639,7 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
>   {
>   	struct nlattr *afspec;
>   	struct net_bridge_port *p;
> -	int err = 0, ret_offload = 0;
> +	int err = 0;
>   
>   	afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
>   	if (!afspec)
> @@ -658,16 +658,6 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
>   		 */
>   		br_ifinfo_notify(RTM_NEWLINK, p);
>   
> -	if (p && !(flags & BRIDGE_FLAGS_SELF)) {
> -		/* del bridge attributes in hardware
> -		 */
> -		ret_offload = netdev_switch_port_bridge_dellink(dev, nlh,
> -								flags);
> -		if (ret_offload && ret_offload != -EOPNOTSUPP)
> -			br_warn(p->br, "error deleting attrs on port %u (%s)\n",
> -				(unsigned int)p->port_no, p->dev->name);
> -	}
> -
>   	return err;
>   }
>   static int br_validate(struct nlattr *tb[], struct nlattr *data[])
> diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
> index 0307a45..8a07096 100644
> --- a/net/switchdev/switchdev.c
> +++ b/net/switchdev/switchdev.c
> @@ -258,61 +258,6 @@ int swdev_port_bridge_setlink(struct net_device *dev,
>   }
>   EXPORT_SYMBOL_GPL(swdev_port_bridge_setlink);
>   
> -/**
> - *	netdev_switch_port_bridge_dellink - Notify switch device port of bridge
> - *	port attribute delete
> - *
> - *	@dev: port device
> - *	@nlh: netlink msg with bridge port attributes
> - *	@flags: bridge setlink flags
> - *
> - *	Notify switch device port of bridge port attribute delete
> - */
> -int netdev_switch_port_bridge_dellink(struct net_device *dev,
> -				      struct nlmsghdr *nlh, u16 flags)
> -{
> -	const struct net_device_ops *ops = dev->netdev_ops;
> -
> -	if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
> -		return 0;
> -
> -	if (!ops->ndo_bridge_dellink)
> -		return -EOPNOTSUPP;
> -
> -	return ops->ndo_bridge_dellink(dev, nlh, flags);
> -}
> -EXPORT_SYMBOL_GPL(netdev_switch_port_bridge_dellink);
> -
> -/**
> - *	ndo_dflt_netdev_switch_port_bridge_dellink - default ndo bridge dellink
> - *						     op for master devices
> - *
> - *	@dev: port device
> - *	@nlh: netlink msg with bridge port attributes
> - *	@flags: bridge dellink flags
> - *
> - *	Notify master device slaves of bridge port attribute deletes
> - */
> -int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> -					       struct nlmsghdr *nlh, u16 flags)
> -{
> -	struct net_device *lower_dev;
> -	struct list_head *iter;
> -	int ret = 0, err = 0;
> -
> -	if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
> -		return ret;
> -
> -	netdev_for_each_lower_dev(dev, lower_dev, iter) {
> -		err = netdev_switch_port_bridge_dellink(lower_dev, nlh, flags);
> -		if (err && err != -EOPNOTSUPP)
> -			ret = err;
> -	}
> -
> -	return ret;
> -}
> -EXPORT_SYMBOL_GPL(ndo_dflt_netdev_switch_port_bridge_dellink);
> -
>   static struct net_device *netdev_switch_get_lowest_dev(struct net_device *dev)
>   {
>   	const struct swdev_ops *ops = dev->swdev_ops;