diff options
| author | Tom Herbert | 2013-07-29 20:07:36 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-07-31 04:16:51 +0200 |
| commit | fca418955148e4f4555d7ce911e9eee3e7970a7f (patch) | |
| tree | d4403a0fa1f31c96ca5880f2c062018d78b1bf13 | |
| parent | Merge branch 'phys_port' (diff) | |
| download | kernel-qcow2-linux-fca418955148e4f4555d7ce911e9eee3e7970a7f.tar.gz kernel-qcow2-linux-fca418955148e4f4555d7ce911e9eee3e7970a7f.tar.xz kernel-qcow2-linux-fca418955148e4f4555d7ce911e9eee3e7970a7f.zip | |
flow_dissector: clean up IPIP case
Explicitly set proto to ETH_P_IP and jump directly to ip processing.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/flow_dissector.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 00ee068efc1c..3259446f3026 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -139,7 +139,8 @@ ipv6: break; } case IPPROTO_IPIP: - goto again; + proto = htons(ETH_P_IP); + goto ip; default: break; } |