aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2013-12-17 23:23:11 -0800
committerDavid S. Miller <davem@davemloft.net>2013-12-18 15:00:52 -0500
commitbd5cef035990a8f4be812f0c34ce34316cb8e9d5 (patch)
treef26bb6be6af4af81f678117c5c3cd54fe741f1b0 /drivers
parentnet: bnx2 calls skb_set_hash (diff)
downloadlinux-dev-bd5cef035990a8f4be812f0c34ce34316cb8e9d5.tar.xz
linux-dev-bd5cef035990a8f4be812f0c34ce34316cb8e9d5.zip
net: bnx2x calls skb_set_hash
Drivers should call skb_set_hash to set the hash and its type in an skbuff. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index ec96130533cc..787fef6c6618 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -728,8 +728,9 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
skb_reserve(skb, pad + NET_SKB_PAD);
skb_put(skb, len);
- skb->rxhash = tpa_info->rxhash;
- skb->l4_rxhash = tpa_info->l4_rxhash;
+ skb_set_hash(skb, tpa_info->rxhash,
+ tpa_info->l4_rxhash ?
+ PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3);
skb->protocol = eth_type_trans(skb, bp->dev);
skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -846,6 +847,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
enum eth_rx_cqe_type cqe_fp_type;
u16 len, pad, queue;
u8 *data;
+ u32 rxhash;
bool l4_rxhash;
#ifdef BNX2X_STOP_ON_ERROR
@@ -987,8 +989,9 @@ reuse_rx:
skb->protocol = eth_type_trans(skb, bp->dev);
/* Set Toeplitz hash for a none-LRO skb */
- skb->rxhash = bnx2x_get_rxhash(bp, cqe_fp, &l4_rxhash);
- skb->l4_rxhash = l4_rxhash;
+ rxhash = bnx2x_get_rxhash(bp, cqe_fp, &l4_rxhash);
+ skb_set_hash(skb, rxhash,
+ l4_rxhash ? PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3);
skb_checksum_none_assert(skb);