diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 10:50:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 10:50:25 +0100 |
| commit | e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec (patch) | |
| tree | 863e0e108f7b7ba2dffc7575bbdfc2d454fc2017 /net/ipv6/ip6_offload.c | |
| parent | 44dba3d5d6a10685fb15bd1954e62016334825e0 (diff) | |
| parent | 6e998916dfe327e785e7c2447959b2c1a3ea4930 (diff) | |
| download | op-kernel-dev-e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec.zip op-kernel-dev-e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec.tar.gz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/ip6_offload.c')
| -rw-r--r-- | net/ipv6/ip6_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index 91014d3..a071563 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -90,7 +90,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, encap = SKB_GSO_CB(skb)->encap_level > 0; if (encap) - features = skb->dev->hw_enc_features & netif_skb_features(skb); + features &= skb->dev->hw_enc_features; SKB_GSO_CB(skb)->encap_level += sizeof(*ipv6h); ipv6h = ipv6_hdr(skb); |
