Commit 5605c762 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: move __skb_tx_hash to dev.c 



__skb_tx_hash function has no relation to flow_dissect so just move it
to dev.c

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c684b50

include/linux/netdevice.h

+3 −0
Original line number Diff line number Diff line
@@ -2832,6 +2832,9 @@ static inline int netif_set_xps_queue(struct net_device *dev, 
}

#endif



u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,

		  unsigned int num_tx_queues);



/*

 * Returns a Tx hash for the given packet when dev->real_num_tx_queues is used

 * as a distribution range limit for the returned value.

include/linux/skbuff.h

+0 −3
Original line number Diff line number Diff line
@@ -3299,9 +3299,6 @@ static inline bool skb_rx_queue_recorded(const struct sk_buff *skb) 
	return skb->queue_mapping != 0;

}



u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,

		  unsigned int num_tx_queues);



static inline struct sec_path *skb_sec_path(struct sk_buff *skb)

{

#ifdef CONFIG_XFRM

net/core/dev.c

+28 −0
Original line number Diff line number Diff line
@@ -2350,6 +2350,34 @@ void netif_device_attach(struct net_device *dev) 
}

EXPORT_SYMBOL(netif_device_attach);



/*

 * Returns a Tx hash based on the given packet descriptor a Tx queues' number

 * to be used as a distribution range.

 */

u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,

		  unsigned int num_tx_queues)

{

	u32 hash;

	u16 qoffset = 0;

	u16 qcount = num_tx_queues;



	if (skb_rx_queue_recorded(skb)) {

		hash = skb_get_rx_queue(skb);

		while (unlikely(hash >= num_tx_queues))

			hash -= num_tx_queues;

		return hash;

	}



	if (dev->num_tc) {

		u8 tc = netdev_get_prio_tc_map(dev, skb->priority);

		qoffset = dev->tc_to_txq[tc].offset;

		qcount = dev->tc_to_txq[tc].count;

	}



	return (u16) reciprocal_scale(skb_get_hash(skb), qcount) + qoffset;

}

EXPORT_SYMBOL(__skb_tx_hash);



static void skb_warn_bad_offload(const struct sk_buff *skb)

{

	static const netdev_features_t null_features = 0;

net/core/flow_dissector.c

+0 −28
Original line number Diff line number Diff line
@@ -371,34 +371,6 @@ __u32 skb_get_hash_perturb(const struct sk_buff *skb, u32 perturb) 
}

EXPORT_SYMBOL(skb_get_hash_perturb);



/*

 * Returns a Tx hash based on the given packet descriptor a Tx queues' number

 * to be used as a distribution range.

 */

u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,

		  unsigned int num_tx_queues)

{

	u32 hash;

	u16 qoffset = 0;

	u16 qcount = num_tx_queues;



	if (skb_rx_queue_recorded(skb)) {

		hash = skb_get_rx_queue(skb);

		while (unlikely(hash >= num_tx_queues))

			hash -= num_tx_queues;

		return hash;

	}



	if (dev->num_tc) {

		u8 tc = netdev_get_prio_tc_map(dev, skb->priority);

		qoffset = dev->tc_to_txq[tc].offset;

		qcount = dev->tc_to_txq[tc].count;

	}



	return (u16) reciprocal_scale(skb_get_hash(skb), qcount) + qoffset;

}

EXPORT_SYMBOL(__skb_tx_hash);



u32 __skb_get_poff(const struct sk_buff *skb, void *data,

		   const struct flow_keys *keys, int hlen)

{