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>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a2e25de98bdeaf21a89dcda794923c6017fadf68..fe7c38721775e562282b0a8122fbcc60def22afb 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -76,7 +76,7 @@
 #include <net/netns/generic.h>
 #include <net/pkt_sched.h>
 #include <linux/rculist.h>
-#include <net/flow_keys.h>
+#include <net/flow_dissector.h>
 #include <net/switchdev.h>
 #include <net/bonding.h>
 #include <net/bond_3ad.h>

diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c
index 0be6850be8a2383e11240093bd421dfbd2595595..380f04903a36d2ab91c64488f98c56f5fbe57e6c 100644 (file)
--- a/drivers/net/ethernet/cisco/enic/enic_clsf.c
+++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c
@@ -5,7 +5,7 @@
 #include <linux/in.h>
 #include <linux/types.h>
 #include <linux/skbuff.h>
-#include <net/flow_keys.h>
+#include <net/flow_dissector.h>
 #include "enic_res.h"
 #include "enic_clsf.h"
 

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index c0b574a414e7593d6af993637f944b42f70a454e..e35c2b13d4347ab8b492360234e32015fd26d20c 100644 (file)
--- 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
similarity index 90%
rename from include/net/flow_keys.h
rename to include/net/flow_dissector.h
index 6d6ef626811a46ba359670b8d9eabd6843dd1c22..5e99a7b3963c5926e512818c4f8fefab77d312a9 100644 (file)
--- 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 d14af7edd197c2c364c1da62addc9781aa79fe84..562eb653aebc2f4b6e1782eba9fe26060dc48439 100644 (file)
--- 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 53d25ef1699a49ebd29a49eb17ded222dc6c8f5c..9932b86394a989523d497ed3d4aadd28c7ad68de 100644 (file)
--- 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

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index d3acc4dff4ae134c3698f8c27464efd3716a6be6..eaa86b5392213301e9a25d448eccff5e4bf863c4 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -12,7 +12,7 @@
 #include <linux/if_tunnel.h>
 #include <linux/if_pppox.h>
 #include <linux/ppp_defs.h>
-#include <net/flow_keys.h>
+#include <net/flow_dissector.h>
 #include <scsi/fc/fc_fcoe.h>
 
 /* copy saddr & daddr, possibly using 64bit load/store

diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index a620c4e288a51f55771399f6c1f81328bab9f7c7..4c5a92298906ca5ab8a9860e75f8ee120fe0d6ed 100644 (file)
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -26,7 +26,7 @@
 #include <net/pkt_cls.h>
 #include <net/ip.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)
 #include <net/netfilter/nf_conntrack.h>

diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index dfe3da75594cc7be2752bcb18de96ed9f8733408..2624e991a2d103dc833caf117449fbd21759cf1b 100644 (file)
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -18,7 +18,7 @@
 #include <net/pkt_sched.h>
 #include <net/inet_ecn.h>
 #include <net/red.h>
-#include <net/flow_keys.h>
+#include <net/flow_dissector.h>
 
 /*
    CHOKe stateless AQM for fair bandwidth allocation