[PATCH 04/17] net: bnx2x calls skb_get_rxhash
From: Tom Herbert <hidden>
Date: 2013-11-26 05:55:33
Subsystem:
broadcom bnx2x 10 gigabit ethernet driver, networking drivers, the rest · Maintainers:
Sudarsana Kalluru, Manish Chopra, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Drivers should call skb_get_rxhash to set the rxhash and its type in an skbuff. Signed-off-by: Tom Herbert <redacted> --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index dcafbda..7c1d45d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c@@ -728,8 +728,8 @@ 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_rxhash(skb, tpa_info->rxhash, + tpa_info->l4_rxhash ? RXHASH_TYPE_L4 : RXHASH_TYPE_L3); skb->protocol = eth_type_trans(skb, bp->dev); skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -846,6 +846,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 +988,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_rxhash(skb, rxhash, + l4_rxhash ? RXHASH_TYPE_L4 : RXHASH_TYPE_L3); skb_checksum_none_assert(skb);
--
1.8.4.1