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

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

macvlan: do vlan cleanup 



ndo_vlan_rx_register is no longer in use in any driver so remove it.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc0e4070

drivers/net/macvlan.c

+0 −12
Original line number Diff line number Diff line
@@ -510,17 +510,6 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev, 
	return stats;

}



static void macvlan_vlan_rx_register(struct net_device *dev,

				     struct vlan_group *grp)

{

	struct macvlan_dev *vlan = netdev_priv(dev);

	struct net_device *lowerdev = vlan->lowerdev;

	const struct net_device_ops *ops = lowerdev->netdev_ops;



	if (ops->ndo_vlan_rx_register)

		ops->ndo_vlan_rx_register(lowerdev, grp);

}



static void macvlan_vlan_rx_add_vid(struct net_device *dev,

				    unsigned short vid)

{
@@ -575,7 +564,6 @@ static const struct net_device_ops macvlan_netdev_ops = { 
	.ndo_set_multicast_list	= macvlan_set_multicast_list,

	.ndo_get_stats64	= macvlan_dev_get_stats64,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_vlan_rx_register	= macvlan_vlan_rx_register,

	.ndo_vlan_rx_add_vid	= macvlan_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= macvlan_vlan_rx_kill_vid,

};