i40evf: don't store unnecessary array of strings

Since we store the traffic vector names in the queue vector struct, we
don't need to maintain an array of strings for these names in the
adapter structure. Replace this array with a single string and use it
when allocating the misc irq vector.

Also update copyrights.

Change-ID: I664f096c3c008210d6a04a487163e8aa934fee5b
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h
index 37f5877df2a9c7fa58df7aa5966f6225794ea0d7..696c9d1251885b245f3b47d6b115bea2f29e6cbb 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf.h
+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h
@@ -190,7 +190,7 @@ struct i40evf_adapter {
        struct delayed_work init_task;
        struct i40e_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
        struct list_head vlan_filter_list;
-       char name[MAX_MSIX_COUNT][IFNAMSIZ + 9];
+       char misc_vector_name[IFNAMSIZ + 9];
 
        /* TX */
        struct i40e_ring *tx_rings[I40E_MAX_VSI_QP];

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index f5caf441924370145b0fb3a5e409033893c40aff..d271d3a5ae28524552c6c1ba2bc33501cc234421 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -511,9 +511,10 @@ static int i40evf_request_misc_irq(struct i40evf_adapter *adapter)
        struct net_device *netdev = adapter->netdev;
        int err;
 
-       sprintf(adapter->name[0], "i40evf:mbx");
+       sprintf(adapter->misc_vector_name, "i40evf:mbx");
        err = request_irq(adapter->msix_entries[0].vector,
-                         &i40evf_msix_aq, 0, adapter->name[0], netdev);
+                         &i40evf_msix_aq, 0,
+                         adapter->misc_vector_name, netdev);
        if (err) {
                dev_err(&adapter->pdev->dev,
                        "request_irq for msix_aq failed: %d\n", err);