Commit 5ab0d6a0 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-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2016-06-29

This series contains fixes to e1000e and ixgbevf.

Jarod Wilson's fix for e1000e was a follow-on patch to his previous fix to
keep the hardware VLAN CTAG's for receive and transmit in sync, which
in turn resolves the original issue, so revert a portion of the original
fix.

Xin Long noticed that the ret_val needed to be initialized to IXGBE_ERR_MBX,
instead of -IXGBE_ERR_MBX.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e7bdea77 b3a3c517

drivers/net/ethernet/intel/e1000e/netdev.c

+9 −12
Original line number Diff line number Diff line
@@ -154,16 +154,6 @@ void __ew32(struct e1000_hw *hw, unsigned long reg, u32 val) 
	writel(val, hw->hw_addr + reg);

}



static bool e1000e_vlan_used(struct e1000_adapter *adapter)

{

	u16 vid;



	for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)

		return true;



	return false;

}



/**

 * e1000_regdump - register printout routine

 * @hw: pointer to the HW structure
@@ -3453,8 +3443,7 @@ static void e1000e_set_rx_mode(struct net_device *netdev) 


	ew32(RCTL, rctl);



	if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX ||

	    e1000e_vlan_used(adapter))

	if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)

		e1000e_vlan_strip_enable(adapter);

	else

		e1000e_vlan_strip_disable(adapter);
@@ -6926,6 +6915,14 @@ static netdev_features_t e1000_fix_features(struct net_device *netdev, 
	if ((hw->mac.type >= e1000_pch2lan) && (netdev->mtu > ETH_DATA_LEN))

		features &= ~NETIF_F_RXFCS;



	/* Since there is no support for separate Rx/Tx vlan accel

	 * enable/disable make sure Tx flag is always in same state as Rx.

	 */

	if (features & NETIF_F_HW_VLAN_CTAG_RX)

		features |= NETIF_F_HW_VLAN_CTAG_TX;

	else

		features &= ~NETIF_F_HW_VLAN_CTAG_TX;



	return features;

}

drivers/net/ethernet/intel/ixgbevf/mbx.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static s32 ixgbevf_poll_for_ack(struct ixgbe_hw *hw) 
static s32 ixgbevf_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)

{

	struct ixgbe_mbx_info *mbx = &hw->mbx;

	s32 ret_val = -IXGBE_ERR_MBX;

	s32 ret_val = IXGBE_ERR_MBX;



	if (!mbx->ops.read)

		goto out;
@@ -111,7 +111,7 @@ out: 
static s32 ixgbevf_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)

{

	struct ixgbe_mbx_info *mbx = &hw->mbx;

	s32 ret_val = -IXGBE_ERR_MBX;

	s32 ret_val = IXGBE_ERR_MBX;



	/* exit if either we can't write or there isn't a defined timeout */

	if (!mbx->ops.write || !mbx->timeout)

CRA Git | Maintained and supported by SUSTech CRA and CCSE