From db83d3e1be279f6ef7d8444c5bff37a599f4e6b7 Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Mon, 1 Feb 2010 05:24:57 +0000 Subject: [PATCH] --- yaml --- r: 183787 b: refs/heads/master c: ce6684433fb277406dd861fd8a17133253e7c367 h: refs/heads/master i: 183785: 0640fa6dfe8045a170f9bfe2e93ae2bcef6dfea8 183783: f674d84e3d5a7ce9f21b41ae3f6c09a858699b17 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_ethtool.c | 6 +++--- trunk/drivers/net/qlcnic/qlcnic_main.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index deacf3545236..05b42d90a3eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b95a839587f40abab2f9cb3e5254dc821b9829b +refs/heads/master: ce6684433fb277406dd861fd8a17133253e7c367 diff --git a/trunk/drivers/net/qlcnic/qlcnic_ethtool.c b/trunk/drivers/net/qlcnic/qlcnic_ethtool.c index 65e9620e28f1..37df5f6cea08 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_ethtool.c +++ b/trunk/drivers/net/qlcnic/qlcnic_ethtool.c @@ -326,12 +326,12 @@ qlcnic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) | (adapter->pdev)->device; - if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC) - return; - for (i = 0; diag_registers[i] != -1; i++) regs_buff[i] = QLCRD32(adapter, diag_registers[i]); + if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC) + return; + regs_buff[i++] = 0xFFEFCDAB; /* Marker btw regs and ring count*/ regs_buff[i++] = 1; /* No. of tx ring */ diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c index 9a98285ee791..7259adc32631 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/qlcnic/qlcnic_main.c @@ -2051,7 +2051,9 @@ qlcnic_detach_work(struct work_struct *work) qlcnic_down(adapter, netdev); + rtnl_lock(); qlcnic_detach(adapter); + rtnl_unlock(); status = QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1);