OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69e12d8
)
flow_dissector: clean up IPIP case
author
Tom Herbert
<therbert@google.com>
Mon, 29 Jul 2013 18:07:36 +0000
(11:07 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 31 Jul 2013 02:16:51 +0000
(19:16 -0700)
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>
net/core/flow_dissector.c
patch
|
blob
|
history
diff --git
a/net/core/flow_dissector.c
b/net/core/flow_dissector.c
index
00ee068
..
3259446
100644
(file)
--- 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;
}