summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2014-05-16 17:04:55 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-31 13:20:34 -0700
commit102e103f76a52e68f2169b86f0536debaf65d548 (patch)
tree0b09f66fa1195ec096b32e91cf4836a08fd6de96 /net/core
parentd0166f814a1daef5992c19d5c18f2860e17ad2f1 (diff)
downloadlinux-stable-102e103f76a52e68f2169b86f0536debaf65d548.tar.gz
linux-stable-102e103f76a52e68f2169b86f0536debaf65d548.tar.bz2
linux-stable-102e103f76a52e68f2169b86f0536debaf65d548.zip
vlan: Fix lockdep warning with stacked vlan devices.
[ Upstream commit d38569ab2bba6e6b3233acfc3a84cdbcfbd1f79f ] This reverts commit dc8eaaa006350d24030502a4521542e74b5cb39f. vlan: Fix lockdep warning when vlan dev handle notification Instead we use the new new API to find the lock subclass of our vlan device. This way we can support configurations where vlans are interspersed with other devices: bond -> vlan -> macvlan -> vlan Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 540386c0bc66..7c229745a2b0 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5269,7 +5269,6 @@ void __dev_set_rx_mode(struct net_device *dev)
if (ops->ndo_set_rx_mode)
ops->ndo_set_rx_mode(dev);
}
-EXPORT_SYMBOL(__dev_set_rx_mode);
void dev_set_rx_mode(struct net_device *dev)
{