diff options
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlan.c | 2 | ||||
-rw-r--r-- | net/8021q/vlan_dev.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 8970ba139d7..5471628d3ff 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -133,7 +133,7 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) | |||
133 | if (grp->nr_vlans == 0) { | 133 | if (grp->nr_vlans == 0) { |
134 | vlan_gvrp_uninit_applicant(real_dev); | 134 | vlan_gvrp_uninit_applicant(real_dev); |
135 | 135 | ||
136 | rcu_assign_pointer(real_dev->vlgrp, NULL); | 136 | RCU_INIT_POINTER(real_dev->vlgrp, NULL); |
137 | 137 | ||
138 | /* Free the group, after all cpu's are done. */ | 138 | /* Free the group, after all cpu's are done. */ |
139 | call_rcu(&grp->rcu, vlan_rcu_free); | 139 | call_rcu(&grp->rcu, vlan_rcu_free); |
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 9d40a071d03..c8cf9391417 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -610,7 +610,8 @@ static int vlan_ethtool_get_settings(struct net_device *dev, | |||
610 | struct ethtool_cmd *cmd) | 610 | struct ethtool_cmd *cmd) |
611 | { | 611 | { |
612 | const struct vlan_dev_info *vlan = vlan_dev_info(dev); | 612 | const struct vlan_dev_info *vlan = vlan_dev_info(dev); |
613 | return dev_ethtool_get_settings(vlan->real_dev, cmd); | 613 | |
614 | return __ethtool_get_settings(vlan->real_dev, cmd); | ||
614 | } | 615 | } |
615 | 616 | ||
616 | static void vlan_ethtool_get_drvinfo(struct net_device *dev, | 617 | static void vlan_ethtool_get_drvinfo(struct net_device *dev, |
@@ -674,7 +675,6 @@ static const struct net_device_ops vlan_netdev_ops = { | |||
674 | .ndo_validate_addr = eth_validate_addr, | 675 | .ndo_validate_addr = eth_validate_addr, |
675 | .ndo_set_mac_address = vlan_dev_set_mac_address, | 676 | .ndo_set_mac_address = vlan_dev_set_mac_address, |
676 | .ndo_set_rx_mode = vlan_dev_set_rx_mode, | 677 | .ndo_set_rx_mode = vlan_dev_set_rx_mode, |
677 | .ndo_set_multicast_list = vlan_dev_set_rx_mode, | ||
678 | .ndo_change_rx_flags = vlan_dev_change_rx_flags, | 678 | .ndo_change_rx_flags = vlan_dev_change_rx_flags, |
679 | .ndo_do_ioctl = vlan_dev_ioctl, | 679 | .ndo_do_ioctl = vlan_dev_ioctl, |
680 | .ndo_neigh_setup = vlan_dev_neigh_setup, | 680 | .ndo_neigh_setup = vlan_dev_neigh_setup, |