diff options
author | David S. Miller <davem@davemloft.net> | 2014-09-05 17:47:12 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-05 17:47:12 -0700 |
commit | 2ba38943ba190eb6a494262003e23187d1b40fb4 (patch) | |
tree | d132fa676dc72a6bb0b9c6ef648f2dc694b6eeda /include/net | |
parent | Merge branch 'timestamping' (diff) | |
parent | ixgbe: use new eth_get_headlen interface (diff) | |
download | linux-dev-2ba38943ba190eb6a494262003e23187d1b40fb4.tar.xz linux-dev-2ba38943ba190eb6a494262003e23187d1b40fb4.zip |
Merge branch 'eth_get_headlen'
Alexander Duyck says:
====================
net: Drop get_headlen functions in favor of generic function
This series replaces the igb_get_headlen and ixgbe_get_headlen functions
with a generic function named eth_get_headlen.
I have done some performance testing on ixgbe with 258 byte frames since
the calls are only used on frames larger than 256 bytes and have seen no
significant difference in CPU utilization.
v2: renamed __skb_get_poff to skb_get_poff
renamed ___skb_get_poff to __skb_get_poff
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/flow_keys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h index 9a03f73c4974..7ee2df083542 100644 --- a/include/net/flow_keys.h +++ b/include/net/flow_keys.h @@ -40,4 +40,6 @@ static inline __be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 return __skb_flow_get_ports(skb, thoff, ip_proto, NULL, 0); } u32 flow_hash_from_keys(struct flow_keys *keys); +unsigned int flow_get_hlen(const unsigned char *data, unsigned int max_len, + __be16 protocol); #endif |