From c1500bc0b4b614fd5234d1aef92507dbcf66514f Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Date: Thu, 4 Aug 2011 17:38:48 -0700
Subject: [PATCH] --- yaml --- r: 270961 b: refs/heads/master c:
 3f8744d147375aca902de7a9f2632a89872565f4 h: refs/heads/master i:   270959:
 1bb129c6b7bdb19ff27424fbdaababcb3923413d v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d47579664d72..cc2d15eb48a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fb8fd0dbc0f7e3bc3ea594223e5d4b50c2092d9
+refs/heads/master: 3f8744d147375aca902de7a9f2632a89872565f4
diff --git a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index ca2e20690b93..62c0e94a916f 100644
--- a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -547,6 +547,14 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
 			break;
 		}
 	}
+
+	if (fh->fh_r_ctl == FC_RCTL_BA_ABTS) {
+		/* Drop incoming ABTS */
+		put_cpu();
+		kfree_skb(skb);
+		return;
+	}
+
 	if (le32_to_cpu(fr_crc(fp)) !=
 			~crc32(~0, skb->data, fr_len)) {
 		if (stats->InvalidCRCCount < 5)