Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vlan: kill ndo_vlan_rx_register

Browse source 
has no users so remove it

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2011-07-20 04:54:48 +00:00 committed by David S. Miller
parent 4f7a4505f8
commit 7890a5b9cb
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/linux/netdevice.h
View file

@ -768,12 +768,6 @@ struct netdev_tc_txq {
* 3. Update dev->stats asynchronously and atomically, and define * 3. Update dev->stats asynchronously and atomically, and define
* neither operation. * 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); * 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) * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
* this function is called when a VLAN id is registered. * this function is called when a VLAN id is registered.
@ -892,8 +886,6 @@ struct net_device_ops {
struct rtnl_link_stats64 *storage); struct rtnl_link_stats64 *storage);
struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); 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, void (*ndo_vlan_rx_add_vid)(struct net_device *dev,
unsigned short vid); unsigned short vid);
void (*ndo_vlan_rx_kill_vid)(struct net_device *dev, void (*ndo_vlan_rx_kill_vid)(struct net_device *dev,

4
net/8021q/vlan.c
View file

@ -134,8 +134,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
vlan_gvrp_uninit_applicant(real_dev); vlan_gvrp_uninit_applicant(real_dev);
rcu_assign_pointer(real_dev->vlgrp, NULL); 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. */ /* Free the group, after all cpu's are done. */
call_rcu(&grp->rcu, vlan_rcu_free); call_rcu(&grp->rcu, vlan_rcu_free);
@ -207,8 +205,6 @@ int register_vlan_dev(struct net_device *dev)
grp->nr_vlans++; grp->nr_vlans++;
if (ngrp) { 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); rcu_assign_pointer(real_dev->vlgrp, ngrp);
} }
if (real_dev->features & NETIF_F_HW_VLAN_FILTER) if (real_dev->features & NETIF_F_HW_VLAN_FILTER)