Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3958afa1 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: Change skb_get_rxhash to skb_get_hash 



Changing name of function as part of making the hash in skbuff to be
generic property, not just for receive path.

Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1aee6cc2

drivers/net/macvtap.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static struct macvtap_queue *macvtap_get_queue(struct net_device *dev, 
		goto out;



	/* Check if we can use flow to select a queue */

	rxq = skb_get_rxhash(skb);

	rxq = skb_get_hash(skb);

	if (rxq) {

		tap = rcu_dereference(vlan->taps[rxq % numvtaps]);

		goto out;

drivers/net/tun.c

+2 −2
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb) 
	rcu_read_lock();

	numqueues = ACCESS_ONCE(tun->numqueues);



	txq = skb_get_rxhash(skb);

	txq = skb_get_hash(skb);

	if (txq) {

		e = tun_flow_find(&tun->flows[tun_hashfn(txq)], txq);

		if (e)
@@ -1146,7 +1146,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
	skb_reset_network_header(skb);

	skb_probe_transport_header(skb, 0);



	rxhash = skb_get_rxhash(skb);

	rxhash = skb_get_hash(skb);

	netif_rx_ni(skb);



	tun->dev->stats.rx_packets++;

drivers/net/vxlan.c

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ __be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb) 
	unsigned int range = (port_max - port_min) + 1;

	u32 hash;



	hash = skb_get_rxhash(skb);

	hash = skb_get_hash(skb);

	if (!hash)

		hash = jhash(skb->data, 2 * ETH_ALEN,

			     (__force u32) skb->protocol);

include/linux/skbuff.h

+3 −3
Original line number Diff line number Diff line
@@ -703,11 +703,11 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, 
			   unsigned int to, struct ts_config *config,

			   struct ts_state *state);



void __skb_get_rxhash(struct sk_buff *skb);

static inline __u32 skb_get_rxhash(struct sk_buff *skb)

void __skb_get_hash(struct sk_buff *skb);

static inline __u32 skb_get_hash(struct sk_buff *skb)

{

	if (!skb->l4_rxhash)

		__skb_get_rxhash(skb);

		__skb_get_hash(skb);



	return skb->rxhash;

}

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -3006,7 +3006,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb, 
	}



	skb_reset_network_header(skb);

	if (!skb_get_rxhash(skb))

	if (!skb_get_hash(skb))

		goto done;



	flow_table = rcu_dereference(rxqueue->rps_flow_table);
@@ -3151,7 +3151,7 @@ static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen) 
	rcu_read_lock();

	fl = rcu_dereference(sd->flow_limit);

	if (fl) {

		new_flow = skb_get_rxhash(skb) & (fl->num_buckets - 1);

		new_flow = skb_get_hash(skb) & (fl->num_buckets - 1);

		old_flow = fl->history[fl->history_head];

		fl->history[fl->history_head] = new_flow;