aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index fedd34cff91c..7347cdbe736f 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -567,21 +567,21 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
567} 567}
568 568
569static int macvlan_vlan_rx_add_vid(struct net_device *dev, 569static int macvlan_vlan_rx_add_vid(struct net_device *dev,
570 unsigned short vid) 570 __be16 proto, u16 vid)
571{ 571{
572 struct macvlan_dev *vlan = netdev_priv(dev); 572 struct macvlan_dev *vlan = netdev_priv(dev);
573 struct net_device *lowerdev = vlan->lowerdev; 573 struct net_device *lowerdev = vlan->lowerdev;
574 574
575 return vlan_vid_add(lowerdev, vid); 575 return vlan_vid_add(lowerdev, proto, vid);
576} 576}
577 577
578static int macvlan_vlan_rx_kill_vid(struct net_device *dev, 578static int macvlan_vlan_rx_kill_vid(struct net_device *dev,
579 unsigned short vid) 579 __be16 proto, u16 vid)
580{ 580{
581 struct macvlan_dev *vlan = netdev_priv(dev); 581 struct macvlan_dev *vlan = netdev_priv(dev);
582 struct net_device *lowerdev = vlan->lowerdev; 582 struct net_device *lowerdev = vlan->lowerdev;
583 583
584 vlan_vid_del(lowerdev, vid); 584 vlan_vid_del(lowerdev, proto, vid);
585 return 0; 585 return 0;
586} 586}
587 587