Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1dfee8e authored by Mitch Williams's avatar Mitch Williams Committed by David S. Miller
Browse files

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: default avatarMitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarSibai Li <sibai.li@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 708e8c24

drivers/net/ethernet/intel/i40evf/i40evf.h

+1 −1
Original line number Diff line number Diff line
@@ -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];

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+4 −3
Original line number Diff line number Diff line 
/*******************************************************************************

 *

 * 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);