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

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

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/ethernet/cisco/enic/enic_clsf.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

include/linux/skbuff.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

 *

include/net/flow_keys.h→include/net/flow_dissector.h

+11 −4
Original line number Diff line number Diff line 
#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);

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -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;