diff options
| author | James Morris <james.morris@microsoft.com> | 2018-09-04 21:35:54 +0300 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-09-04 21:35:54 +0300 |
| commit | e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce (patch) | |
| tree | f956a5ea0e83fc6d0df3e64681e7bbc1f201f3ee /net/nsh/nsh.c | |
| parent | 4408e300a67ab2ce2505087986a9fe922c800ffd (diff) | |
| parent | 57361846b52bc686112da6ca5368d11210796804 (diff) | |
| download | linux-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.tar.xz | |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
Diffstat (limited to 'net/nsh/nsh.c')
| -rw-r--r-- | net/nsh/nsh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nsh/nsh.c b/net/nsh/nsh.c index 9696ef96b719..1a30e165eeb4 100644 --- a/net/nsh/nsh.c +++ b/net/nsh/nsh.c @@ -104,7 +104,7 @@ static struct sk_buff *nsh_gso_segment(struct sk_buff *skb, __skb_pull(skb, nsh_len); skb_reset_mac_header(skb); - skb_reset_mac_len(skb); + skb->mac_len = proto == htons(ETH_P_TEB) ? ETH_HLEN : 0; skb->protocol = proto; features &= NETIF_F_SG; |