From 8018f66f522745fbb44dd26e1b2ffbdcc651f3bb Mon Sep 17 00:00:00 2001 From: Tom Herbert Date: Wed, 5 May 2010 17:57:16 +0000 Subject: [PATCH] --- yaml --- r: 194767 b: refs/heads/master c: 4447957a825031b3faf3b5bc2013afe35eff492b h: refs/heads/master i: 194765: 9c08277ff0849abd2a9772c2ead5e1c8a3e43d42 194763: 82d355f7dace6dc8b630a84bdc949527ffcd5ea4 194759: 665de4d6e3c8dfa6ea9d0ea5b46d7a0b0c27b96b 194751: 09f4376661c7bbf39189b9dbaacf7f59303b31bf v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4f2d75c612ad..22a6ec85dcab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2861a185e3ac2ebe5958a2039b66062445bf4f7d +refs/heads/master: 4447957a825031b3faf3b5bc2013afe35eff492b diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index f706ed191f19..2bc35c794aec 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x_main.c @@ -1726,7 +1726,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) skb->protocol = eth_type_trans(skb, bp->dev); - if ((bp->dev->features & ETH_FLAG_RXHASH) && + if ((bp->dev->features & NETIF_F_RXHASH) && (cqe_fp_status_flags & ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG)) skb->rxhash = le32_to_cpu(