summaryrefslogtreecommitdiff
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-21 01:24:29 +0300
committerDavid S. Miller <davem@davemloft.net>2010-03-21 01:24:29 +0300
commite77c8e83dd587f2616d7ff20d23a897891e6e20d (patch)
treeba5d2ce6541119f329b2fd51181aaae8528b38f0 /net/core/dev.c
parent641cb85e68945878d520d5fc3c2dc64aa1dda868 (diff)
parentaf98441397227a5a4f212cd48710eea72a14dbdb (diff)
downloadlinux-e77c8e83dd587f2616d7ff20d23a897891e6e20d.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index d1f027c41e73..c0e260870c0a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2622,6 +2622,7 @@ int __netif_receive_skb(struct sk_buff *skb)
{
struct packet_type *ptype, *pt_prev;
struct net_device *orig_dev;
+ struct net_device *master;
struct net_device *null_or_orig;
struct net_device *null_or_bond;
int ret = NET_RX_DROP;
@@ -2642,11 +2643,12 @@ int __netif_receive_skb(struct sk_buff *skb)
null_or_orig = NULL;
orig_dev = skb->dev;
- if (orig_dev->master) {
- if (skb_bond_should_drop(skb))
+ master = ACCESS_ONCE(orig_dev->master);
+ if (master) {
+ if (skb_bond_should_drop(skb, master))
null_or_orig = orig_dev; /* deliver only exact match */
else
- skb->dev = orig_dev->master;
+ skb->dev = master;
}
__get_cpu_var(netdev_rx_stat).total++;