projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-2.6-block.git]
/
drivers
/
net
/
bonding
/
bond_alb.c
diff --git
a/drivers/net/bonding/bond_alb.c
b/drivers/net/bonding/bond_alb.c
index a1e7eb92bbf1e98a3b752944a25ff07dbb62adc5..00ab51ef3129c835523bc2aefebbb076f7a89aa9 100644
(file)
--- a/
drivers/net/bonding/bond_alb.c
+++ b/
drivers/net/bonding/bond_alb.c
@@
-355,9
+355,6
@@
static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
struct arp_pkt *arp = (struct arp_pkt *)skb->data;
int res = NET_RX_DROP;
- if (dev_net(bond_dev) != &init_net)
- goto out;
-
while (bond_dev->priv_flags & IFF_802_1Q_VLAN)
bond_dev = vlan_dev_real_dev(bond_dev);