diff options
author | Tom Herbert <therbert@google.com> | 2014-03-24 18:34:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-26 15:58:20 -0400 |
commit | 61b905da33ae25edb6b9d2a5de21e34c3a77efe3 (patch) | |
tree | 74990d790d603e989210b0221703910d9beef4f1 /net/packet | |
parent | 4e2e865d959e095ab8f1a112e7952c9baa173d0a (diff) |
net: Rename skb->rxhash to skb->hash
The packet hash can be considered a property of the packet, not just
on RX path.
This patch changes name of rxhash and l4_rxhash skbuff fields to be
hash and l4_hash respectively. This includes changing uses of the
field in the code which don't call the access functions.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
-rw-r--r-- | net/packet/af_packet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 292304404fda..097a354ec8cd 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -1277,7 +1277,7 @@ static unsigned int fanout_demux_hash(struct packet_fanout *f, | |||
1277 | struct sk_buff *skb, | 1277 | struct sk_buff *skb, |
1278 | unsigned int num) | 1278 | unsigned int num) |
1279 | { | 1279 | { |
1280 | return reciprocal_scale(skb->rxhash, num); | 1280 | return reciprocal_scale(skb_get_hash(skb), num); |
1281 | } | 1281 | } |
1282 | 1282 | ||
1283 | static unsigned int fanout_demux_lb(struct packet_fanout *f, | 1283 | static unsigned int fanout_demux_lb(struct packet_fanout *f, |
@@ -1362,7 +1362,6 @@ static int packet_rcv_fanout(struct sk_buff *skb, struct net_device *dev, | |||
1362 | if (!skb) | 1362 | if (!skb) |
1363 | return 0; | 1363 | return 0; |
1364 | } | 1364 | } |
1365 | skb_get_hash(skb); | ||
1366 | idx = fanout_demux_hash(f, skb, num); | 1365 | idx = fanout_demux_hash(f, skb, num); |
1367 | break; | 1366 | break; |
1368 | case PACKET_FANOUT_LB: | 1367 | case PACKET_FANOUT_LB: |