[net-next 0/3] Intel Wired LAN Driver Updates

[net-next 0/3] Intel Wired LAN Driver Updates

[Aaron Brown]

This series contains an updates to ixgbe and ixgbevf.

Jacob add braces around some ixgbe_qv_lock_* calls lto better adhere 
to Kernel style guidelines.  Don bumps the versions on ixgbe and
ixgbevf to match internal driver functionality better.

Don Skidmore (2):
  ixgbe: bump version number
  ixgbevf: bump version

Jacob Keller (1):
  ixgbe: add braces around else condition in ixgbe_qv_lock_* calls

 drivers/net/ethernet/intel/ixgbe/ixgbe.h          | 6 ++++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c     | 2 +-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

-- 
1.8.5.GIT

[net-next 1/3] ixgbe: add braces around else condition in ixgbe_qv_lock_* calls

[Aaron Brown]

From: Jacob Keller <jacob.e.keller@intel.com>

This patch adds braces around the ixgbe_qv_lock_* calls which previously only
had braces around the if portion. Kernel style guidelines for this require
parenthesis around all conditions if they are required around one. In addition
the comment while not illegal C syntax makes the code look wrong at a cursory
glance. This patch corrects the style and adds braces so that the full if-else
block is uniform.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 3a4373f..0186ea2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -424,9 +424,10 @@ static inline bool ixgbe_qv_lock_napi(struct ixgbe_q_vector *q_vector)
 #ifdef BP_EXTENDED_STATS
 		q_vector->tx.ring->stats.yields++;
 #endif
-	} else
+	} else {
 		/* we don't care if someone yielded */
 		q_vector->state = IXGBE_QV_STATE_NAPI;
+	}
 	spin_unlock_bh(&q_vector->lock);
 	return rc;
 }
@@ -458,9 +459,10 @@ static inline bool ixgbe_qv_lock_poll(struct ixgbe_q_vector *q_vector)
 #ifdef BP_EXTENDED_STATS
 		q_vector->rx.ring->stats.yields++;
 #endif
-	} else
+	} else {
 		/* preserve yield marks */
 		q_vector->state |= IXGBE_QV_STATE_POLL;
+	}
 	spin_unlock_bh(&q_vector->lock);
 	return rc;
 }
-- 
1.8.5.GIT

[net-next 2/3] ixgbe: bump version number

[Aaron Brown]

From: Don Skidmore <donald.c.skidmore@intel.com>

Bump the version number to better match functionality provided with out
of tree driver of the same version.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index b445ad1..72e2035 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -64,7 +64,7 @@ char ixgbe_default_device_descr[] =
 static char ixgbe_default_device_descr[] =
 			      "Intel(R) 10 Gigabit Network Connection";
 #endif
-#define DRV_VERSION "3.15.1-k"
+#define DRV_VERSION "3.19.1-k"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static const char ixgbe_copyright[] =
 				"Copyright (c) 1999-2013 Intel Corporation.";
-- 
1.8.5.GIT

[net-next 3/3] ixgbevf: bump version

[Aaron Brown]

From: Don Skidmore <donald.c.skidmore@intel.com>

Bump the version number to better match functionality provided with out of
tree driver of the same version.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 6cf4120..9c92918 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -58,7 +58,7 @@ const char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
 	"Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
 
-#define DRV_VERSION "2.11.3-k"
+#define DRV_VERSION "2.12.1-k"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
 	"Copyright (c) 2009 - 2012 Intel Corporation.";
-- 
1.8.5.GIT

Re: [net-next 0/3] Intel Wired LAN Driver Updates

[David Miller]

From: Aaron Brown <aaron.f.brown@intel.com>
Date: Fri, 17 Jan 2014 01:21:35 -0800

> This series contains an updates to ixgbe and ixgbevf.
> 
> Jacob add braces around some ixgbe_qv_lock_* calls lto better adhere 
> to Kernel style guidelines.  Don bumps the versions on ixgbe and
> ixgbevf to match internal driver functionality better.

Series applied, thanks.

[net-next 0/3] Intel Wired LAN Driver Updates

[Aaron Brown]

This series contains updates to ixgbe for LER / adapter removal.
Mark restores the HW address in the recovery path so the device is
not perpetually removed, fixes up some removed state ethtool results
and adds checks related to config space access.


Mark Rustad (3):
  ixgbe: Restore hw_addr in LER recovery paths
  ixgbe: Fix up some ethtool results when adapter is removed
  ixgbe: Check config reads for removal

 drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c   | 10 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c  | 16 +++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h  |  6 ++-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |  9 +++-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c    | 62 +++++++++++++++++++++---
 5 files changed, 85 insertions(+), 18 deletions(-)

-- 
1.8.5.GIT

[net-next 0/3] Intel Wired LAN Driver Updates

[Aaron Brown]

This series contains updates to i40e from Shannon Nelson.  The first 
removes a mistaken file that I apparently introduced as part of a 
branch merge / update.  Second checks that descritors were allocated
before printing and makes the code a bit easier to read.  Finally he 
refines cloud support in the Firmware API.

Shannon Nelson (3): 
  i40e: remove mistaken file  
  i40e: check desc pointer before printing
  i40e: updates to AdminQ interface

 drivers/net/ethernet/intel/i40e/Module.symvers    |  0
 drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 22 +++-----
 drivers/net/ethernet/intel/i40e/i40e_common.c     |  1 -
 drivers/net/ethernet/intel/i40e/i40e_debugfs.c    | 67 +++++++++++++----------
 4 files changed, 47 insertions(+), 43 deletions(-)
 delete mode 100644 drivers/net/ethernet/intel/i40e/Module.symvers

-- 
1.8.5.GIT