summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2011-05-22 10:08:09 +0000
committerDavid S. Miller <davem@davemloft.net>2011-05-22 21:01:23 -0400
commitc3a8ce6145cfcfce192513187000cd723313d94f (patch)
tree04e32f613162c4accec704b69c919aa9029ed651
parent40955532bc9d865999dfc58b7896605d58650655 (diff)
downloadlinux-3.10-c3a8ce6145cfcfce192513187000cd723313d94f.tar.gz
linux-3.10-c3a8ce6145cfcfce192513187000cd723313d94f.tar.bz2
linux-3.10-c3a8ce6145cfcfce192513187000cd723313d94f.zip
bnx2x: properly handle CFC DEL in cnic flow
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index f45c0caf324..fb23d575d63 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -3666,7 +3666,8 @@ static int bnx2x_cnic_handle_cfc_del(struct bnx2x *bp, u32 cid,
union event_ring_elem *elem)
{
if (!bp->cnic_eth_dev.starting_cid ||
- cid < bp->cnic_eth_dev.starting_cid)
+ (cid < bp->cnic_eth_dev.starting_cid &&
+ cid != bp->cnic_eth_dev.iscsi_l2_cid))
return 1;
DP(BNX2X_MSG_SP, "got delete ramrod for CNIC CID %d\n", cid);