projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.19-rockchip-dts4' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
net
/
ipv4
/
af_inet.c
diff --git
a/net/ipv4/af_inet.c
b/net/ipv4/af_inet.c
index 92db7a69f2b9d106d7d235388719d3a476eb91d5..8b7fe5b039068559a931b931529f02841cc13fe2 100644
(file)
--- a/
net/ipv4/af_inet.c
+++ b/
net/ipv4/af_inet.c
@@
-1246,7
+1246,7
@@
static struct sk_buff *inet_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 += ihl;
skb_reset_transport_header(skb);
This page took
0.02324 seconds
and
5
git commands to generate.