diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-11-07 08:37:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-08 13:30:02 -0500 |
| commit | 3797d3e8462efdaadb64164ca540626b55fe8336 (patch) | |
| tree | 34f7b159f88933738c73e3c8f39d38b1715dd103 /net | |
| parent | cdc4ead09d3ee0ce48054b81ac31bc8179182dae (diff) | |
| download | blackbird-op-linux-3797d3e8462efdaadb64164ca540626b55fe8336.tar.gz blackbird-op-linux-3797d3e8462efdaadb64164ca540626b55fe8336.zip | |
net: flow_dissector: small optimizations in IPv4 dissect
By moving code around, we avoid :
1) A reload of iph->ihl (bit field, so needs a mask)
2) A conditional test (replaced by a conditional mov on x86)
Fast path loads iph->protocol anyway.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/flow_dissector.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 0242035192f1..d6ef17322500 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -68,13 +68,13 @@ ip: iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph); if (!iph || iph->ihl < 5) return false; + nhoff += iph->ihl * 4; + ip_proto = iph->protocol; if (ip_is_fragment(iph)) ip_proto = 0; - else - ip_proto = iph->protocol; + iph_to_flow_copy_addrs(flow, iph); - nhoff += iph->ihl * 4; break; } case __constant_htons(ETH_P_IPV6): { |
