diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:03:35 +0800 |
| commit | d28996d022a87e81bd6d4bedd5990b68d7e4d567 (patch) | |
| tree | 8b7a18ca2701b77a626a0e3c155d5e63a7fa99a6 /net/core/dev.c | |
| parent | ec54c473486f2addc56e99c1191e4975123930d7 (diff) | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-17.02-rt
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 1cbcf08cc224..d5c917816185 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4060,7 +4060,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; /* Setup for GRO checksum validation */ switch (skb->ip_summed) { |