summaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-07-20 04:54:47 +0000
committerDavid S. Miller <davem@davemloft.net>2011-07-21 13:47:58 -0700
commit4f7a4505f8356a739b13e55e964a7f4dc43a1633 (patch)
treecc33c37bcdd6444b67493e50135cb670e057cfd3 /drivers/net/macvlan.c
parentcc0e40700656b09d93b062ef6c818aa45429d09a (diff)
downloadop-kernel-dev-4f7a4505f8356a739b13e55e964a7f4dc43a1633.zip
op-kernel-dev-4f7a4505f8356a739b13e55e964a7f4dc43a1633.tar.gz
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/macvlan.c')
-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 cc67cbe..ba631fc 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,
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,
};
OpenPOWER on IntegriCloud