diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
| commit | f108c898ddae4bb1146ed9e46ce4470725d945c4 (patch) | |
| tree | bb887907e0448d4d903f853c33b3c55a863412e2 /net/ipv6/ip6_offload.c | |
| parent | 904cb3677f3adcd3d837be0a0d0b14251ba8d6f7 (diff) | |
| parent | 68055915c1c22489f9658bd2b7391bb11b2cf4e4 (diff) | |
| download | linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.tar.gz linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.tar.bz2 linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
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 91014d32488d..a071563a7e6e 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); |