diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:18 +0800 |
| commit | 1714a3e139090705a0bd862a8b7bba930181cfbd (patch) | |
| tree | db99631954ee29375180ac2fd1499a516c5b9ca7 /net/core/dev.c | |
| parent | 25f89e269f5c5d06594098cc3b1d97554249f3f9 (diff) | |
| parent | 887b692a469f9a9a666654e607103f5204ac5eb7 (diff) | |
Merge tag 'v4.4.30' into linux-linaro-lsk-v4.4
This is the 4.4.30 stable release
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index de4ed2b5a221..0989fea88c44 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4239,7 +4239,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff NAPI_GRO_CB(skb)->same_flow = 0; NAPI_GRO_CB(skb)->flush = 0; NAPI_GRO_CB(skb)->free = 0; - NAPI_GRO_CB(skb)->udp_mark = 0; + NAPI_GRO_CB(skb)->encap_mark = 0; NAPI_GRO_CB(skb)->gro_remcsum_start = 0; /* Setup for GRO checksum validation */ |