* [net PATCH 1/3] qlcnic: Fix internal loopback test for 82xx adapter
2013-02-21 21:09 [net PATCH 0/3] qlcnic: bug fixes Jitendra Kalsaria
@ 2013-02-21 21:09 ` Jitendra Kalsaria
2013-02-21 21:09 ` [net PATCH 2/3] qlcnic: Fix configure interrupts for 83xx adapter types Jitendra Kalsaria
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jitendra Kalsaria @ 2013-02-21 21:09 UTC (permalink / raw)
To: davem; +Cc: netdev, sony.chacko, Dept_NX_Linux_NIC_Driver, Shahed Shaikh
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
o Use correct function to clear loopback mode.
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 11c3db6..474b479 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -1755,7 +1755,7 @@ static inline int qlcnic_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
static inline int qlcnic_clear_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
{
- return adapter->ahw->hw_ops->config_loopback(adapter, mode);
+ return adapter->ahw->hw_ops->clear_loopback(adapter, mode);
}
static inline int qlcnic_nic_set_promisc(struct qlcnic_adapter *adapter,
--
1.7.6.rc1.1.g2c162b
^ permalink raw reply related [flat|nested] 5+ messages in thread* [net PATCH 2/3] qlcnic: Fix configure interrupts for 83xx adapter types
2013-02-21 21:09 [net PATCH 0/3] qlcnic: bug fixes Jitendra Kalsaria
2013-02-21 21:09 ` [net PATCH 1/3] qlcnic: Fix internal loopback test for 82xx adapter Jitendra Kalsaria
@ 2013-02-21 21:09 ` Jitendra Kalsaria
2013-02-21 21:09 ` [net PATCH 3/3] qlcnic: Bump up the version to 5.1.35 Jitendra Kalsaria
2013-02-21 23:18 ` [net PATCH 0/3] qlcnic: bug fixes David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jitendra Kalsaria @ 2013-02-21 21:09 UTC (permalink / raw)
To: davem; +Cc: netdev, sony.chacko, Dept_NX_Linux_NIC_Driver, Manish Chopra
From: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index c53832b..5c033f2 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -589,13 +589,6 @@ static int qlcnic_83xx_idc_reattach_driver(struct qlcnic_adapter *adapter)
qlcnic_83xx_register_nic_idc_func(adapter, 1);
qlcnic_83xx_enable_mbx_intrpt(adapter);
- if ((adapter->flags & QLCNIC_MSIX_ENABLED)) {
- if (qlcnic_83xx_config_intrpt(adapter, 1)) {
- netdev_err(adapter->netdev,
- "Failed to enable mbx intr\n");
- return -EIO;
- }
- }
if (qlcnic_83xx_configure_opmode(adapter)) {
qlcnic_83xx_idc_enter_failed_state(adapter, 1);
--
1.7.6.rc1.1.g2c162b
^ permalink raw reply related [flat|nested] 5+ messages in thread* [net PATCH 3/3] qlcnic: Bump up the version to 5.1.35
2013-02-21 21:09 [net PATCH 0/3] qlcnic: bug fixes Jitendra Kalsaria
2013-02-21 21:09 ` [net PATCH 1/3] qlcnic: Fix internal loopback test for 82xx adapter Jitendra Kalsaria
2013-02-21 21:09 ` [net PATCH 2/3] qlcnic: Fix configure interrupts for 83xx adapter types Jitendra Kalsaria
@ 2013-02-21 21:09 ` Jitendra Kalsaria
2013-02-21 23:18 ` [net PATCH 0/3] qlcnic: bug fixes David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jitendra Kalsaria @ 2013-02-21 21:09 UTC (permalink / raw)
To: davem; +Cc: netdev, sony.chacko, Dept_NX_Linux_NIC_Driver, Jitendra Kalsaria
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 474b479..ba3c72f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -38,8 +38,8 @@
#define _QLCNIC_LINUX_MAJOR 5
#define _QLCNIC_LINUX_MINOR 1
-#define _QLCNIC_LINUX_SUBVERSION 34
-#define QLCNIC_LINUX_VERSIONID "5.1.34"
+#define _QLCNIC_LINUX_SUBVERSION 35
+#define QLCNIC_LINUX_VERSIONID "5.1.35"
#define QLCNIC_DRV_IDC_VER 0x01
#define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\
(_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
--
1.7.6.rc1.1.g2c162b
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [net PATCH 0/3] qlcnic: bug fixes
2013-02-21 21:09 [net PATCH 0/3] qlcnic: bug fixes Jitendra Kalsaria
` (2 preceding siblings ...)
2013-02-21 21:09 ` [net PATCH 3/3] qlcnic: Bump up the version to 5.1.35 Jitendra Kalsaria
@ 2013-02-21 23:18 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-02-21 23:18 UTC (permalink / raw)
To: jitendra.kalsaria; +Cc: netdev, sony.chacko, Dept_NX_Linux_NIC_Driver
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Date: Thu, 21 Feb 2013 16:09:45 -0500
> Please apply to net.
Series applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread