From bd6d25de488b7838ade3e48dba26d161b996220c Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Tue, 17 Aug 2010 00:34:19 +0000 Subject: [PATCH] --- yaml --- r: 213811 b: refs/heads/master c: 933fce12a33f219e9021a9ab7b2f9cff94fa8b0e h: refs/heads/master i: 213809: a229666e1336ef4f1cd678ae7287753f2d8d0ebf 213807: f8d88d430a8b6d0ed2355384f8262bb671fec507 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1df3cb36740..06c026c8b94c 100644 --- 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 index bf6d87adda4f..4ecbf41230cb 100644 --- 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);