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

Commit d78f802f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-02-05

This series contains updates to fm10k, ixgbe and ixgbevf.

Matthew fixes an issue where fm10k does not properly drop the upper-most four
bits on of the VLAN ID due to type promotion, so resolve the issue by not
masking off the bits, but by throwing an error if the VLAN ID is out-of-bounds.
Then cleans up two cases where variables were not being used, but were
being set, so just remove the unused variables.

Don cleans up sparse errors in the x550 family file for ixgbe.  Fixed up
a redundant setting of the default value for set_rxpba, which was done
twice accidentally.  Cleaned up the probe routine to remove a redundant
attempt to identify the PHY, which could lead to a panic on x550.  Added
support for VXLAN receive checksum offload in x550 hardware.  Added the
Ethertype Anti-spoofing feature for affected devices.

Emil enables ixgbe and ixgbevf to allow multiple queues in SRIOV mode.
Adds RSS support for x550 per VF.  Fixed up a couple of issues introduced
in commit 2b509c0c ("ixgbe: cleanup ixgbe_ndo_set_vf_vlan"), fixed
setting of the VLAN inside ixgbe_enable_port_vlan() and disable the
"hide VLAN" bit in PFQDE when port VLAN is disabled.  Cleaned up the
setting of vlan_features by enabling all features at once.  Fixed the
ordering of the shutdown patch so that we attempt to shutdown the rings
more gracefully.  We shutdown the main Rx filter in the case of Rx and we
set the carrier_off state in the case of Tx so that packets stop being
delivered from outside the driver.  Then we shutdown interrupts and NAPI,
then finally stop the rings from performing DMA and clean them.  Added
code to allow for Tx hang checking to provide more robust debug info in
the event of a transmit unit hang in ixgbevf.  Cleaned up ixgbevf logic
dealing with link up/down by breaking down the link detection and up/down
events into separate functions, similar to how these events are handled
in other drivers.  Combined the ixgbevf reset and watchdog tasks into a
single task so that we can avoid multiple schedules of the reset task when
we have a reset event needed due to either the mailbox going down or
transmit packets being present on a link down.

v2: Fixed up patch #03 of the series to remove the variable type change
    based on feedback from David Laight
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 57ee062e 5b7f000f

drivers/net/ethernet/intel/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -192,6 +192,17 @@ config IXGBE 
	  To compile this driver as a module, choose M here. The module

	  will be called ixgbe.



config IXGBE_VXLAN

	bool "Virtual eXtensible Local Area Network Support"

	default n

	depends on IXGBE && VXLAN && !(IXGBE=y && VXLAN=m)

	---help---

	  This allows one to create VXLAN virtual interfaces that provide

	  Layer 2 Networks over Layer 3 Networks. VXLAN is often used

	  to tunnel virtual network infrastructure in virtualized environments.

	  Say Y here if you want to use Virtual eXtensible Local Area Network

	  (VXLAN) in the driver.



config IXGBE_HWMON

	bool "Intel(R) 10GbE PCI Express adapters HWMON support"

	default y

drivers/net/ethernet/intel/fm10k/fm10k_mbx.c

+2 −3
Original line number Diff line number Diff line
@@ -1194,12 +1194,11 @@ static s32 fm10k_mbx_process_disconnect(struct fm10k_hw *hw, 
{

	const enum fm10k_mbx_state state = mbx->state;

	const u32 *hdr = &mbx->mbx_hdr;

	u16 head, tail;

	u16 head;

	s32 err;



	/* we will need to pull all of the fields for verification */

	/* we will need to pull the header field for verification */

	head = FM10K_MSG_HDR_FIELD_GET(*hdr, HEAD);

	tail = FM10K_MSG_HDR_FIELD_GET(*hdr, TAIL);



	/* We should not be receiving disconnect if Rx is incomplete */

	if (mbx->pushed)

drivers/net/ethernet/intel/fm10k/fm10k_pf.c

+2 −5
Original line number Diff line number Diff line
@@ -330,13 +330,10 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort, 
	struct fm10k_mac_update mac_update;

	u32 msg[5];



	/* if glort is not valid return error */

	if (!fm10k_glort_valid_pf(hw, glort))

	/* if glort or vlan are not valid return error */

	if (!fm10k_glort_valid_pf(hw, glort) || vid >= FM10K_VLAN_TABLE_VID_MAX)

		return FM10K_ERR_PARAM;



	/* drop upper 4 bits of VLAN ID */

	vid = (vid << 4) >> 4;



	/* record fields */

	mac_update.mac_lower = cpu_to_le32(((u32)mac[2] << 24) |

						 ((u32)mac[3] << 16) |

drivers/net/ethernet/intel/fm10k/fm10k_ptp.c

+0 −3
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ void fm10k_ts_tx_enqueue(struct fm10k_intfc *interface, struct sk_buff *skb) 
	struct sk_buff_head *list = &interface->ts_tx_skb_queue;

	struct sk_buff *clone;

	unsigned long flags;

	__le16 dglort;



	/* create clone for us to return on the Tx path */

	clone = skb_clone_sk(skb);
@@ -65,8 +64,6 @@ void fm10k_ts_tx_enqueue(struct fm10k_intfc *interface, struct sk_buff *skb) 
		return;



	FM10K_CB(clone)->ts_tx_timeout = jiffies + FM10K_TS_TX_TIMEOUT;

	dglort = FM10K_CB(clone)->fi.w.dglort;



	spin_lock_irqsave(&list->lock, flags);



	/* attempt to locate any buffers with the same dglort,

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ 
#define IXGBE_MAX_RXD			   4096

#define IXGBE_MIN_RXD			     64



#define IXGBE_ETH_P_LLDP		 0x88CC



/* flow control */

#define IXGBE_MIN_FCRTL			   0x40

#define IXGBE_MAX_FCRTL			0x7FF80
@@ -753,6 +755,7 @@ struct ixgbe_adapter { 
	u32 timer_event_accumulator;

	u32 vferr_refcount;

	struct ixgbe_mac_addr *mac_table;

	u16 vxlan_port;

	struct kobject *info_kobj;

#ifdef CONFIG_IXGBE_HWMON

	struct hwmon_buff *ixgbe_hwmon_buff;