summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Herbert2013-12-16 07:16:29 +0100
committerDavid S. Miller2013-12-17 22:36:22 +0100
commit3df7a74e797aa2d8be9b7c649cfd56a8517dcf6e (patch)
tree5d5e556692e3c945517319e812520286905a4af6
parentnet: Add function to set the rxhash (diff)
downloadkernel-qcow2-linux-3df7a74e797aa2d8be9b7c649cfd56a8517dcf6e.tar.gz
kernel-qcow2-linux-3df7a74e797aa2d8be9b7c649cfd56a8517dcf6e.tar.xz
kernel-qcow2-linux-3df7a74e797aa2d8be9b7c649cfd56a8517dcf6e.zip
net: Add utility function to copy skb hash
Adds skb_copy_hash to copy rxhash and l4_rxhash from one skb to another. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/skbuff.h6
-rw-r--r--net/core/skbuff.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 99846956dff9..06bedeb0d49e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -764,6 +764,12 @@ static inline void skb_clear_hash_if_not_l4(struct sk_buff *skb)
skb_clear_hash(skb);
}
+static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)
+{
+ to->rxhash = from->rxhash;
+ to->l4_rxhash = from->l4_rxhash;
+};
+
#ifdef NET_SKBUFF_DATA_USES_OFFSET
static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
{
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 06e72d3cdf60..2b6b863f51f2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -712,9 +712,8 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
new->inner_network_header = old->inner_network_header;
new->inner_mac_header = old->inner_mac_header;
skb_dst_copy(new, old);
- new->rxhash = old->rxhash;
+ skb_copy_hash(new, old);
new->ooo_okay = old->ooo_okay;
- new->l4_rxhash = old->l4_rxhash;
new->no_fcs = old->no_fcs;
new->encapsulation = old->encapsulation;
#ifdef CONFIG_XFRM