diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2014-04-14 17:37:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-14 18:58:58 -0400 |
| commit | 1e785f48d29a09b6cf96db7b49b6320dada332e1 (patch) | |
| tree | add7932efbb608a2137f9d3b8c0a7d96f950a77d /net/core | |
| parent | 362d52040c71f6e8d8158be48c812d7729cb8df1 (diff) | |
| download | op-kernel-dev-1e785f48d29a09b6cf96db7b49b6320dada332e1.zip op-kernel-dev-1e785f48d29a09b6cf96db7b49b6320dada332e1.tar.gz | |
net: Start with correct mac_len in skb_network_protocol
Sometimes, when the packet arrives at skb_mac_gso_segment()
its skb->mac_len already accounts for some of the mac lenght
headers in the packet. This seems to happen when forwarding
through and OpenSSL tunnel.
When we start looking for any vlan headers in skb_network_protocol()
we seem to ignore any of the already known mac headers and start
with an ETH_HLEN. This results in an incorrect offset, dropped
TSO frames and general slowness of the connection.
We can start counting from the known skb->mac_len
and return at least that much if all mac level headers
are known and accounted for.
Fixes: 53d6471cef17262d3ad1c7ce8982a234244f68ec (net: Account for all vlan headers in skb_mac_gso_segment)
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Daniel Borkman <dborkman@redhat.com>
Tested-by: Martin Filip <nexus+kernel@smoula.net>
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -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 14dac06..5b3042e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2284,7 +2284,7 @@ EXPORT_SYMBOL(skb_checksum_help); __be16 skb_network_protocol(struct sk_buff *skb, int *depth) { __be16 type = skb->protocol; - int vlan_depth = ETH_HLEN; + int vlan_depth = skb->mac_len; /* Tunnel gso handlers can set protocol to ethernet. */ if (type == htons(ETH_P_TEB)) { |
