aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-07-20 00:54:47 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-21 16:47:58 -0400
commit4f7a4505f8356a739b13e55e964a7f4dc43a1633 (patch)
treecc33c37bcdd6444b67493e50135cb670e057cfd3 /drivers/net
parentcc0e40700656b09d93b062ef6c818aa45429d09a (diff)
macvlan: do vlan cleanup
ndo_vlan_rx_register is no longer in use in any driver so remove it. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/macvlan.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index cc67cbe670cb..ba631fcece34 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -510,17 +510,6 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
510 return stats; 510 return stats;
511} 511}
512 512
513static void macvlan_vlan_rx_register(struct net_device *dev,
514 struct vlan_group *grp)
515{
516 struct macvlan_dev *vlan = netdev_priv(dev);
517 struct net_device *lowerdev = vlan->lowerdev;
518 const struct net_device_ops *ops = lowerdev->netdev_ops;
519
520 if (ops->ndo_vlan_rx_register)
521 ops->ndo_vlan_rx_register(lowerdev, grp);
522}
523
524static void macvlan_vlan_rx_add_vid(struct net_device *dev, 513static void macvlan_vlan_rx_add_vid(struct net_device *dev,
525 unsigned short vid) 514 unsigned short vid)
526{ 515{
@@ -575,7 +564,6 @@ static const struct net_device_ops macvlan_netdev_ops = {
575 .ndo_set_multicast_list = macvlan_set_multicast_list, 564 .ndo_set_multicast_list = macvlan_set_multicast_list,
576 .ndo_get_stats64 = macvlan_dev_get_stats64, 565 .ndo_get_stats64 = macvlan_dev_get_stats64,
577 .ndo_validate_addr = eth_validate_addr, 566 .ndo_validate_addr = eth_validate_addr,
578 .ndo_vlan_rx_register = macvlan_vlan_rx_register,
579 .ndo_vlan_rx_add_vid = macvlan_vlan_rx_add_vid, 567 .ndo_vlan_rx_add_vid = macvlan_vlan_rx_add_vid,
580 .ndo_vlan_rx_kill_vid = macvlan_vlan_rx_kill_vid, 568 .ndo_vlan_rx_kill_vid = macvlan_vlan_rx_kill_vid,
581}; 569};