From 1f10c2a8a378b675ddda6494287ba6ed01fffd99 Mon Sep 17 00:00:00 2001 From: Vladislav Zolotarov Date: Sun, 22 May 2011 10:08:09 +0000 Subject: [PATCH] --- yaml --- r: 247976 b: refs/heads/master c: c3a8ce6145cfcfce192513187000cd723313d94f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x/bnx2x_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 107b6860f981..47d9ea4536f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40955532bc9d865999dfc58b7896605d58650655 +refs/heads/master: c3a8ce6145cfcfce192513187000cd723313d94f diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c index f45c0caf3240..fb23d575d633 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_main.c +++ b/trunk/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);