---

yaml --- r: 213811 b: refs/heads/master c: 933fce1 h: refs/heads/master i: 213809: a229666 213807: f8d88d4 v: v3
git-mirror · Aug 17, 2010 · bd6d25d · bd6d25d
1 parent 2bbd09d
commit bd6d25d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f76da51f58eda3a027e71e98404b80fcad2d80d
+refs/heads/master: 933fce12a33f219e9021a9ab7b2f9cff94fa8b0e
diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c
@@ -2733,7 +2733,7 @@ static int qlcnic_attach_func(struct pci_dev *pdev)
 	if (qlcnic_api_lock(adapter))
 		return -EINVAL;
 
-	if (first_func) {
+	if (adapter->op_mode != QLCNIC_NON_PRIV_FUNC && first_func) {
 		adapter->need_fw_reset = 1;
 		set_bit(__QLCNIC_START_FW, &adapter->state);
 		QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_INITIALIZING);