diff options
| author | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
| commit | 5ee07f2a498e0a5f4a9994317c0f2e451e27b4f2 (patch) | |
| tree | 8d8cc50a7de738e1e6b7a66ec27120f616b3919a /net/core | |
| parent | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (diff) | |
| parent | 44fb3170ae46f8de964a4bb5b0504e865a6dd7da (diff) | |
Merge commit 'v3.2.9' into rt-3.2.9-rt13v3.2.9-rt13
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 10 | ||||
| -rw-r--r-- | net/core/netpoll.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index c74f35799519..e554093042a0 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3598,14 +3598,20 @@ static inline gro_result_t __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) { struct sk_buff *p; + unsigned int maclen = skb->dev->hard_header_len; for (p = napi->gro_list; p; p = p->next) { unsigned long diffs; diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev; diffs |= p->vlan_tci ^ skb->vlan_tci; - diffs |= compare_ether_header(skb_mac_header(p), - skb_gro_mac_header(skb)); + if (maclen == ETH_HLEN) + diffs |= compare_ether_header(skb_mac_header(p), + skb_gro_mac_header(skb)); + else if (!diffs) + diffs = memcmp(skb_mac_header(p), + skb_gro_mac_header(skb), + maclen); NAPI_GRO_CB(p)->same_flow = !diffs; NAPI_GRO_CB(p)->flush = 0; } diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 5d4d896d5219..ab0633f15d84 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -194,7 +194,7 @@ static void netpoll_poll_dev(struct net_device *dev) poll_napi(dev); - if (dev->priv_flags & IFF_SLAVE) { + if (dev->flags & IFF_SLAVE) { if (dev->npinfo) { struct net_device *bond_dev = dev->master; struct sk_buff *skb; |