Commit 1bd758eb authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

net: change name of flow_dissector header to match the .c file name

add couple of empty lines on the way.
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 212da1fa
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
#include <net/netns/generic.h> #include <net/netns/generic.h>
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <linux/rculist.h> #include <linux/rculist.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
#include <net/switchdev.h> #include <net/switchdev.h>
#include <net/bonding.h> #include <net/bonding.h>
#include <net/bond_3ad.h> #include <net/bond_3ad.h>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/in.h> #include <linux/in.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
#include "enic_res.h" #include "enic_res.h"
#include "enic_clsf.h" #include "enic_clsf.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/netdev_features.h> #include <linux/netdev_features.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
/* A. Checksumming of received packets by device. /* A. Checksumming of received packets by device.
* *
......
#ifndef _NET_FLOW_KEYS_H #ifndef _NET_FLOW_DISSECTOR_H
#define _NET_FLOW_KEYS_H #define _NET_FLOW_DISSECTOR_H
/* struct flow_keys: /* struct flow_keys:
* @src: source ip address in case of IPv4 * @src: source ip address in case of IPv4
...@@ -29,17 +29,24 @@ struct flow_keys { ...@@ -29,17 +29,24 @@ struct flow_keys {
bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow, bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow,
void *data, __be16 proto, int nhoff, int hlen); 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); 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, __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
void *data, int hlen_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); return __skb_flow_get_ports(skb, thoff, ip_proto, NULL, 0);
} }
u32 flow_hash_from_keys(struct flow_keys *keys); u32 flow_hash_from_keys(struct flow_keys *keys);
unsigned int flow_get_hlen(const unsigned char *data, unsigned int max_len, unsigned int flow_get_hlen(const unsigned char *data, unsigned int max_len,
__be16 protocol); __be16 protocol);
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <net/route.h> #include <net/route.h>
#include <net/snmp.h> #include <net/snmp.h>
#include <net/flow.h> #include <net/flow.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
struct sock; struct sock;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <net/if_inet6.h> #include <net/if_inet6.h>
#include <net/ndisc.h> #include <net/ndisc.h>
#include <net/flow.h> #include <net/flow.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
#include <net/snmp.h> #include <net/snmp.h>
#define SIN6_LEN_RFC2133 24 #define SIN6_LEN_RFC2133 24
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/if_tunnel.h> #include <linux/if_tunnel.h>
#include <linux/if_pppox.h> #include <linux/if_pppox.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
#include <scsi/fc/fc_fcoe.h> #include <scsi/fc/fc_fcoe.h>
/* copy saddr & daddr, possibly using 64bit load/store /* copy saddr & daddr, possibly using 64bit load/store
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <net/pkt_cls.h> #include <net/pkt_cls.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/route.h> #include <net/route.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
#include <net/red.h> #include <net/red.h>
#include <net/flow_keys.h> #include <net/flow_dissector.h>
/* /*
CHOKe stateless AQM for fair bandwidth allocation CHOKe stateless AQM for fair bandwidth allocation
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment