summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_private.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-10-31 14:25:33 -0400
committerDavid S. Miller <davem@davemloft.net>2012-10-31 14:26:44 -0400
commit810b6d7638a288216f99bd190470d67061c8bd88 (patch)
tree5c8dd20b10cf4d7d40d286c9b3dd71d6dedaf78c /net/bridge/br_private.h
parentf7b4fb22b838f895ce9fa994f0ef4f7f541f5266 (diff)
parentac61d515f14fd205d8c917a34b27a767b4fe9e05 (diff)
downloadop-kernel-dev-810b6d7638a288216f99bd190470d67061c8bd88.zip
op-kernel-dev-810b6d7638a288216f99bd190470d67061c8bd88.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== This series contains updates to ixgbe, ixgbevf, igbvf, igb and networking core (bridge). Most notably is the addition of support for local link multicast addresses in SR-IOV mode to the networking core. Also note, the ixgbe patch "ixgbe: Add support for pipeline reset" and "ixgbe: Fix return value from macvlan filter function" is revised based on community feedback. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r--net/bridge/br_private.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 6f40c14..d5efa57 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -290,7 +290,6 @@ struct br_input_skb_cb {
pr_debug("%s: " format, (br)->dev->name, ##args)
extern struct notifier_block br_device_notifier;
-extern const u8 br_group_address[ETH_ALEN];
/* called under bridge lock */
static inline int br_is_root_bridge(const struct net_bridge *br)
OpenPOWER on IntegriCloud