| Message ID | alpine.DEB.2.02.1311260914050.21248@tomh.mtv.corp.google.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tom Herbert <therbert@google.com> Date: Tue, 26 Nov 2013 09:22:54 -0800 (PST) > - 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->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); Inconsistent indentation, the second one is correct the first one is not. Please audit this in your entire patch set, there are few other instances. Thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
Drivers should call skb_set_rxhash to set the rxhash and its type in an skbuff. Signed-off-by: Tom Herbert <therbert@google.com> --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)