From 050cf89eab41cd6c9933823879b0a184d15f715b Mon Sep 17 00:00:00 2001
From: Josh Hay <joshua.a.hay@intel.com>
Date: Fri, 4 Jan 2013 03:34:42 +0000
Subject: [PATCH] --- yaml --- r: 352095 b: refs/heads/master c:
 d2c47b626ecdd0efa907355fc7eeb34236b3713a h: refs/heads/master i:   352093:
 107f941eb7083f7c3baaade3728054503119509b   352091:
 31cf29d27cb9228efce5bd446bc9fe3c86ea326f   352087:
 a0be3c1abaf467f7a19dc7769e72d06e6ce8b679   352079:
 4adb0f59b5a8a5c207a84f1dd11ea084f93e8cfe   352063:
 b5052edcf338ab62417204c054aad3f699cc71e1 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c  | 7 +++----
 trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3f67779fe153..e7695727c3d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f752be9c3de4fbb6a9b2c060f3794bd928a0ad7a
+refs/heads/master: d2c47b626ecdd0efa907355fc7eeb34236b3713a
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index c261333438bf..373559010da0 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -449,7 +449,6 @@ static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)
 static int ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)
 {
 	struct ixgbe_adapter *adapter = netdev_priv(netdev);
-	u8 rval = 0;
 
 	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
 		switch (tcid) {
@@ -460,14 +459,14 @@ static int ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)
 			*num = adapter->dcb_cfg.num_tcs.pfc_tcs;
 			break;
 		default:
-			rval = -EINVAL;
+			return -EINVAL;
 			break;
 		}
 	} else {
-		rval = -EINVAL;
+		return -EINVAL;
 	}
 
-	return rval;
+	return 0;
 }
 
 static int ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num)
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index bafd141193af..355ca085ed05 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1099,8 +1099,10 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,
 
 	switch (stringset) {
 	case ETH_SS_TEST:
-		memcpy(data, *ixgbe_gstrings_test,
-		       IXGBE_TEST_LEN * ETH_GSTRING_LEN);
+		for (i = 0; i < IXGBE_TEST_LEN; i++) {
+			memcpy(data, ixgbe_gstrings_test[i], ETH_GSTRING_LEN);
+			data += ETH_GSTRING_LEN;
+		}
 		break;
 	case ETH_SS_STATS:
 		for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {