diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2015-05-12 15:56:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-13 22:19:45 +0300 |
| commit | 1bd758eb1cab2fa5b71a23f9e5d3c8076f4ed650 (patch) | |
| tree | 86862ae2e7637daafe814df8fb9f1169a732a282 /include | |
| parent | 212da1fa60a822f5a7f20d52d11524dadd192a91 (diff) | |
| download | linux-1bd758eb1cab2fa5b71a23f9e5d3c8076f4ed650.tar.xz | |
net: change name of flow_dissector header to match the .c file name
add couple of empty lines on the way.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 2 | ||||
| -rw-r--r-- | include/net/flow_dissector.h (renamed from include/net/flow_keys.h) | 15 | ||||
| -rw-r--r-- | include/net/ip.h | 2 | ||||
| -rw-r--r-- | include/net/ipv6.h | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c0b574a414e7..e35c2b13d434 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -34,7 +34,7 @@ #include <linux/dma-mapping.h> #include <linux/netdev_features.h> #include <linux/sched.h> -#include <net/flow_keys.h> +#include <net/flow_dissector.h> /* A. Checksumming of received packets by device. * diff --git a/include/net/flow_keys.h b/include/net/flow_dissector.h index 6d6ef626811a..5e99a7b3963c 100644 --- a/include/net/flow_keys.h +++ b/include/net/flow_dissector.h @@ -1,5 +1,5 @@ -#ifndef _NET_FLOW_KEYS_H -#define _NET_FLOW_KEYS_H +#ifndef _NET_FLOW_DISSECTOR_H +#define _NET_FLOW_DISSECTOR_H /* struct flow_keys: * @src: source ip address in case of IPv4 @@ -29,17 +29,24 @@ struct flow_keys { bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow, void *data, __be16 proto, int nhoff, int hlen); -static inline bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) + +static inline bool skb_flow_dissect(const struct sk_buff *skb, + struct flow_keys *flow) { return __skb_flow_dissect(skb, flow, NULL, 0, 0, 0); } + __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto, void *data, int hlen_proto); -static inline __be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto) + +static inline __be32 skb_flow_get_ports(const struct sk_buff *skb, + int thoff, u8 ip_proto) { 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); diff --git a/include/net/ip.h b/include/net/ip.h index d14af7edd197..562eb653aebc 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -31,7 +31,7 @@ #include <net/route.h> #include <net/snmp.h> #include <net/flow.h> -#include <net/flow_keys.h> +#include <net/flow_dissector.h> struct sock; diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 53d25ef1699a..9932b86394a9 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -19,7 +19,7 @@ #include <net/if_inet6.h> #include <net/ndisc.h> #include <net/flow.h> -#include <net/flow_keys.h> +#include <net/flow_dissector.h> #include <net/snmp.h> #define SIN6_LEN_RFC2133 24 |