2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index c261333438bf..373559010da0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/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/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index bafd141193af..355ca085ed05 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/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++) {