diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 00:54:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 16:47:58 -0400 |
commit | 7890a5b9cbfd159c81ffd7866b5b2d4425886e7f (patch) | |
tree | cd8167fd420387af1144c4ae0920175c741ea46a /net | |
parent | 4f7a4505f8356a739b13e55e964a7f4dc43a1633 (diff) |
vlan: kill ndo_vlan_rx_register
has no users so remove it
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/8021q/vlan.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index d24c4644b930..8970ba139d73 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -134,8 +134,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) | |||
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_assign_pointer(real_dev->vlgrp, NULL); |
137 | if (ops->ndo_vlan_rx_register) | ||
138 | ops->ndo_vlan_rx_register(real_dev, NULL); | ||
139 | 137 | ||
140 | /* Free the group, after all cpu's are done. */ | 138 | /* Free the group, after all cpu's are done. */ |
141 | call_rcu(&grp->rcu, vlan_rcu_free); | 139 | call_rcu(&grp->rcu, vlan_rcu_free); |
@@ -207,8 +205,6 @@ int register_vlan_dev(struct net_device *dev) | |||
207 | grp->nr_vlans++; | 205 | grp->nr_vlans++; |
208 | 206 | ||
209 | if (ngrp) { | 207 | if (ngrp) { |
210 | if (ops->ndo_vlan_rx_register && (real_dev->features & NETIF_F_HW_VLAN_RX)) | ||
211 | ops->ndo_vlan_rx_register(real_dev, ngrp); | ||
212 | rcu_assign_pointer(real_dev->vlgrp, ngrp); | 208 | rcu_assign_pointer(real_dev->vlgrp, ngrp); |
213 | } | 209 | } |
214 | if (real_dev->features & NETIF_F_HW_VLAN_FILTER) | 210 | if (real_dev->features & NETIF_F_HW_VLAN_FILTER) |