diff options
| author | Linaro CI <ci-bot@linaro.org> | 2021-06-29 09:06:26 +0000 |
|---|---|---|
| committer | Linaro CI <ci-bot@linaro.org> | 2021-06-29 09:06:26 +0000 |
| commit | a04ed9b34d090aa94a0a65b69056553d059db794 (patch) | |
| tree | 218643a92fcc22add4e74bde03df523f6c0b0962 | |
| parent | 4484d7f7d78af71b3b92e418625d18f1c43f5eec (diff) | |
| parent | 83cacca694d1a144b85d8d305093ade5c34b3045 (diff) | |
| download | hikey-linaro-a04ed9b34d090aa94a0a65b69056553d059db794.tar.gz | |
Merge remote-tracking branch 'aosp/android-4.9-q' into android-4.9-q-hikey4.9.273-83cacca694d1-20210629-539
* aosp/android-4.9-q:
FROMGIT: bpf: Do not change gso_size during bpf_skb_change_proto()
| -rw-r--r-- | net/core/filter.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index cf9d0d194a8b..2b3a03f04cc1 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1999,8 +1999,6 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb) skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV6; } - /* Due to IPv6 header, MSS needs to be downgraded. */ - skb_shinfo(skb)->gso_size -= len_diff; /* Header must be checked, and gso_segs recomputed. */ skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY; skb_shinfo(skb)->gso_segs = 0; @@ -2035,8 +2033,6 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb) skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4; } - /* Due to IPv4 header, MSS can be upgraded. */ - skb_shinfo(skb)->gso_size += len_diff; /* Header must be checked, and gso_segs recomputed. */ skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY; skb_shinfo(skb)->gso_segs = 0; |