[PATCH net 0/3] qlge: Bug fixes

[PATCH net 0/3] qlge: Bug fixes

[Jitendra Kalsaria]

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

This patch series include bug fixes.
o Receive frame error stats were getting overwritten by other driver statistics.
o User is allowed to enable/disable rx/tx vlan acceleration independently.

Jitendra Kalsaria (3):
  qlge: Fix ethtool statistics
  qlge: Allow enable/disable rx/tx vlan acceleration independently
  qlge: Update version to 1.00.00.34

 drivers/net/ethernet/qlogic/qlge/qlge.h         |    2 +-
 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c |    4 ++++
 drivers/net/ethernet/qlogic/qlge/qlge_main.c    |    8 --------
 3 files changed, 5 insertions(+), 9 deletions(-)

-- 
1.7.6.rc1.1.g2c162b

[PATCH net 1/3] qlge: Fix ethtool statistics

[Jitendra Kalsaria]

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

o Receive mac error stat was getting overwritten by other stats.

Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 0780e03..8dee1be 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
@@ -181,6 +181,7 @@ static const char ql_gstrings_test[][ETH_GSTRING_LEN] = {
 };
 #define QLGE_TEST_LEN (sizeof(ql_gstrings_test) / ETH_GSTRING_LEN)
 #define QLGE_STATS_LEN ARRAY_SIZE(ql_gstrings_stats)
+#define QLGE_RCV_MAC_ERR_STATS	7
 
 static int ql_update_ring_coalescing(struct ql_adapter *qdev)
 {
@@ -280,6 +281,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
 		iter++;
 	}
 
+	/* Update receive mac error statistics */
+	iter += QLGE_RCV_MAC_ERR_STATS;
+
 	/*
 	 * Get Per-priority TX pause frame counter statistics.
 	 */
-- 
1.7.6.rc1.1.g2c162b

[PATCH net 2/3] qlge: Allow enable/disable rx/tx vlan acceleration independently

[Jitendra Kalsaria]

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

o Fix the driver to allow user to enable/disable rx/tx vlan acceleration independently.

  For example:
	ethtool -K ethX rxvlan on/off
	ethtool -K ethX txvlan on/off

Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlge/qlge_main.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index a245dc1..449f506 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2376,14 +2376,6 @@ static netdev_features_t qlge_fix_features(struct net_device *ndev,
 	netdev_features_t features)
 {
 	int err;
-	/*
-	 * Since there is no support for separate rx/tx vlan accel
-	 * enable/disable make sure tx flag is always in same state as rx.
-	 */
-	if (features & NETIF_F_HW_VLAN_CTAG_RX)
-		features |= NETIF_F_HW_VLAN_CTAG_TX;
-	else
-		features &= ~NETIF_F_HW_VLAN_CTAG_TX;
 
 	/* Update the behavior of vlan accel in the adapter */
 	err = qlge_update_hw_vlan_features(ndev, features);
-- 
1.7.6.rc1.1.g2c162b

[PATCH net 3/3] qlge: Update version to 1.00.00.34

[Jitendra Kalsaria]

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlge/qlge.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
index 0c9c4e8..0351747 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge.h
+++ b/drivers/net/ethernet/qlogic/qlge/qlge.h
@@ -18,7 +18,7 @@
  */
 #define DRV_NAME  	"qlge"
 #define DRV_STRING 	"QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION	"1.00.00.33"
+#define DRV_VERSION	"1.00.00.34"
 
 #define WQ_ADDR_ALIGN	0x3	/* 4 byte alignment */
 
-- 
1.7.6.rc1.1.g2c162b

Re: [PATCH net 0/3] qlge: Bug fixes

[David Miller]

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Date: Thu, 5 Dec 2013 18:11:21 -0500

> This patch series include bug fixes.
> o Receive frame error stats were getting overwritten by other driver statistics.
> o User is allowed to enable/disable rx/tx vlan acceleration independently.

Series applied, thanks.

[PATCH net 0/3] qlge: Bug fixes

[Jitendra Kalsaria]

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

Please apply to net

Thanks,
   Jiten

Jitendra Kalsaria (2):
  qlge: Fix ethtool autoneg advertising.
  qlge: Update version to 1.00.00.32.

Sritej Velaga (1):
  qlge: Fix receive path to drop error frames

 drivers/net/ethernet/qlogic/qlge/qlge.h         |    2 +-
 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c |    2 +-
 drivers/net/ethernet/qlogic/qlge/qlge_main.c    |   36 ++++++++++++++++++----
 3 files changed, 31 insertions(+), 9 deletions(-)

-- 
1.7.6.rc1.1.g2c162b

Re: [PATCH net 0/3] qlge: Bug fixes

[David Miller]

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Date: Fri, 19 Apr 2013 01:49:51 -0400

> Please apply to net

Series applied, thanks.