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

Commit af1a2a9c authored Feb 13, 2014 by Jesse Brandeburg Committed by David S. Miller Feb 13, 2014

i40evf: trivial fixes



This change moves one operator up to the previous line and deletes
the duplicate declaration of ETH_ALEN.

Also update copyrights.

Change-ID: I88de73093b584e0f3b29d481ccd83fc4b1a1afa5
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 14ad3759

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************
	*		*
	* Intel Ethernet Controller XL710 Family Linux Virtual Function Driver		* 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		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,
	@@ -807,8 +807,8 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)

	rx_desc = I40E_RX_DESC(rx_ring, i);		rx_desc = I40E_RX_DESC(rx_ring, i);
	qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);		qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
	rx_status = (qword & I40E_RXD_QW1_STATUS_MASK)		rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
	>> I40E_RXD_QW1_STATUS_SHIFT;		I40E_RXD_QW1_STATUS_SHIFT;

	while (rx_status & (1 << I40E_RX_DESC_STATUS_DD_SHIFT)) {		while (rx_status & (1 << I40E_RX_DESC_STATUS_DD_SHIFT)) {
	union i40e_rx_desc *next_rxd;		union i40e_rx_desc *next_rxd;

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

+1 −3

Original line number	Original line	Diff line number	Diff line
	/*******************************************************************************		/*******************************************************************************
	*		*
	* Intel Ethernet Controller XL710 Family Linux Virtual Function Driver		* 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		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,
	@@ -64,8 +64,6 @@
	struct i40e_hw;		struct i40e_hw;
	typedef void (I40E_ADMINQ_CALLBACK)(struct i40e_hw , struct i40e_aq_desc *);		typedef void (I40E_ADMINQ_CALLBACK)(struct i40e_hw , struct i40e_aq_desc *);

	#define ETH_ALEN 6

	/* Data type manipulation macros. */		/* Data type manipulation macros. */

	#define I40E_DESC_UNUSED(R) \		#define I40E_DESC_UNUSED(R) \