From 5b9d818d776b4b40e7b6018d4aab86eb5e5f0569 Mon Sep 17 00:00:00 2001
From: Karen Xie <kxie@chelsio.com>
Date: Fri, 26 Jun 2009 15:17:29 -0700
Subject: [PATCH] --- yaml --- r: 154803 b: refs/heads/master c:
 a222ad1a4b2e3ca177a538482c99c519c1ce94d1 h: refs/heads/master i:   154801:
 b55b52c8bf31d1aa2d88d8faf49aac519736de27   154799:
 e7d7092499c048dac039692bd85bcc1a9680b19e v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea4569dd20e3..863b7d53ae20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39562e783928e3ea9ee2cbce99a756ab48d3c06a
+refs/heads/master: a222ad1a4b2e3ca177a538482c99c519c1ce94d1
diff --git a/trunk/drivers/scsi/cxgb3i/cxgb3i_iscsi.c b/trunk/drivers/scsi/cxgb3i/cxgb3i_iscsi.c
index 74369a3f963b..c399f485aa7d 100644
--- a/trunk/drivers/scsi/cxgb3i/cxgb3i_iscsi.c
+++ b/trunk/drivers/scsi/cxgb3i/cxgb3i_iscsi.c
@@ -13,6 +13,7 @@
 
 #include <linux/inet.h>
 #include <linux/crypto.h>
+#include <linux/if_vlan.h>
 #include <net/dst.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
@@ -184,6 +185,9 @@ static struct cxgb3i_hba *cxgb3i_hba_find_by_netdev(struct net_device *ndev)
 	struct cxgb3i_adapter *snic;
 	int i;
 
+	if (ndev->priv_flags & IFF_802_1Q_VLAN)
+		ndev = vlan_dev_real_dev(ndev);
+
 	read_lock(&cxgb3i_snic_rwlock);
 	list_for_each_entry(snic, &cxgb3i_snic_list, list_head) {
 		for (i = 0; i < snic->hba_cnt; i++) {