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

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

vlan: kill ndo_vlan_rx_register 



has no users so remove it

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

include/linux/netdevice.h

+0 −8
Original line number Diff line number Diff line
@@ -768,12 +768,6 @@ struct netdev_tc_txq { 
 *	3. Update dev->stats asynchronously and atomically, and define

 *	   neither operation.

 *

 * void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp);

 *	If device support VLAN receive acceleration

 *	(ie. dev->features & NETIF_F_HW_VLAN_RX), then this function is called

 *	when vlan groups for the device changes.  Note: grp is NULL

 *	if no vlan's groups are being used.

 *

 * void (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid);

 *	If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)

 *	this function is called when a VLAN id is registered.
@@ -892,8 +886,6 @@ struct net_device_ops { 
						     struct rtnl_link_stats64 *storage);

	struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);



	void			(*ndo_vlan_rx_register)(struct net_device *dev,

						        struct vlan_group *grp);

	void			(*ndo_vlan_rx_add_vid)(struct net_device *dev,

						       unsigned short vid);

	void			(*ndo_vlan_rx_kill_vid)(struct net_device *dev,

net/8021q/vlan.c

+0 −4
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) 
		vlan_gvrp_uninit_applicant(real_dev);



		rcu_assign_pointer(real_dev->vlgrp, NULL);

		if (ops->ndo_vlan_rx_register)

			ops->ndo_vlan_rx_register(real_dev, NULL);



		/* Free the group, after all cpu's are done. */

		call_rcu(&grp->rcu, vlan_rcu_free);
@@ -207,8 +205,6 @@ int register_vlan_dev(struct net_device *dev) 
	grp->nr_vlans++;



	if (ngrp) {

		if (ops->ndo_vlan_rx_register && (real_dev->features & NETIF_F_HW_VLAN_RX))

			ops->ndo_vlan_rx_register(real_dev, ngrp);

		rcu_assign_pointer(real_dev->vlgrp, ngrp);

	}

	if (real_dev->features & NETIF_F_HW_VLAN_FILTER)