From 73eedcfe84518eab22f4f85ad83fdc1434ca2939 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Wed, 20 Jul 2011 04:54:47 +0000 Subject: [PATCH] --- yaml --- r: 256591 b: refs/heads/master c: 4f7a4505f8356a739b13e55e964a7f4dc43a1633 h: refs/heads/master i: 256589: f9ce930053939d8542ecf2334c090986e92789f5 256587: 2aec6587db4011d5486d9fd130f6dd9e92975948 256583: 459323a87e1779e36af96076fd2ecc02a38af01b 256575: 4df3a52d49917e1cf9e81c5be82bc8006685fed7 v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index ad5f05e4ecba..e5fe81c5625d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc0e40700656b09d93b062ef6c818aa45429d09a +refs/heads/master: 4f7a4505f8356a739b13e55e964a7f4dc43a1633 diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index cc67cbe670cb..ba631fcece34 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/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, };