diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-26 15:28:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-26 15:28:41 +0100 |
| commit | 5266874b09c8a9de744813dd0f7387f02e8191bf (patch) | |
| tree | c30530ae29e10f18f497040ab087a91651166e6f /net/core/dev.c | |
| parent | 05471e4c446ca42d474b89df55bd48b0ce802717 (diff) | |
| parent | 079e683ebd882655b6d6e0b17989e51bae2d77d6 (diff) | |
Merge remote branch 'alsa/devel' into topic/hda
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index bcc490cc9452..59d4394d2ce8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2483,6 +2483,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; @@ -2503,11 +2504,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++; |