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

Commit 3a858a86 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:

====================
This series contains updates to igb, igbvf and ixgbe.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fd5dfca7 14a8d4bb

drivers/net/ethernet/intel/igb/igb_main.c

+2 −3
Original line number Diff line number Diff line
@@ -1589,8 +1589,7 @@ void igb_reset(struct igb_adapter *adapter) 
	struct e1000_hw *hw = &adapter->hw;

	struct e1000_mac_info *mac = &hw->mac;

	struct e1000_fc_info *fc = &hw->fc;

	u32 pba = 0, tx_space, min_tx_space, min_rx_space;

	u16 hwm;

	u32 pba = 0, tx_space, min_tx_space, min_rx_space, hwm;



	/* Repartition Pba for greater than 9k mtu

	 * To take effect CTRL.RST is required.
@@ -1665,7 +1664,7 @@ void igb_reset(struct igb_adapter *adapter) 
	hwm = min(((pba << 10) * 9 / 10),

			((pba << 10) - 2 * adapter->max_frame_size));



	fc->high_water = hwm & 0xFFF0;	/* 16-byte granularity */

	fc->high_water = hwm & 0xFFFFFFF0;	/* 16-byte granularity */

	fc->low_water = fc->high_water - 16;

	fc->pause_time = 0xFFFF;

	fc->send_xon = 1;

drivers/net/ethernet/intel/igbvf/defines.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */

#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */



#define E1000_RXDEXT_STATERR_LB    0x00040000

#define E1000_RXDEXT_STATERR_CE    0x01000000

#define E1000_RXDEXT_STATERR_SE    0x02000000

#define E1000_RXDEXT_STATERR_SEQ   0x04000000

drivers/net/ethernet/intel/igbvf/igbvf.h

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ struct igbvf_info { 


/* hardware capability, feature, and workaround flags */

#define IGBVF_FLAG_RX_CSUM_DISABLED             (1 << 0)



#define IGBVF_FLAG_RX_LB_VLAN_BSWAP		(1 << 1)

#define IGBVF_RX_DESC_ADV(R, i)     \

	(&((((R).desc))[i].rx_desc))

#define IGBVF_TX_DESC_ADV(R, i)     \

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

+14 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 


#include "igbvf.h"



#define DRV_VERSION "2.0.1-k"

#define DRV_VERSION "2.0.2-k"

char igbvf_driver_name[] = "igbvf";

const char igbvf_driver_version[] = DRV_VERSION;

static const char igbvf_driver_string[] =
@@ -107,12 +107,19 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter, 
                              struct sk_buff *skb,

                              u32 status, u16 vlan)

{

	u16 vid;



	if (status & E1000_RXD_STAT_VP) {

		u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;

		if ((adapter->flags & IGBVF_FLAG_RX_LB_VLAN_BSWAP) &&

		    (status & E1000_RXDEXT_STATERR_LB))

			vid = be16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;

		else

			vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;

		if (test_bit(vid, adapter->active_vlans))

			__vlan_hwaccel_put_tag(skb, vid);

	}

	netif_receive_skb(skb);



	napi_gro_receive(&adapter->rx_ring->napi, skb);

}



static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
@@ -2767,6 +2774,10 @@ static int __devinit igbvf_probe(struct pci_dev *pdev, 
	/* reset the hardware with the new settings */

	igbvf_reset(adapter);



	/* set hardware-specific flags */

	if (adapter->hw.mac.type == e1000_vfadapt_i350)

		adapter->flags |= IGBVF_FLAG_RX_LB_VLAN_BSWAP;



	strcpy(netdev->name, "eth%d");

	err = register_netdev(netdev);

	if (err)

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

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP		(u32)(1 << 9)

#define IXGBE_FLAG2_PTP_ENABLED			(u32)(1 << 10)

#define IXGBE_FLAG2_PTP_PPS_ENABLED		(u32)(1 << 11)

#define IXGBE_FLAG2_BRIDGE_MODE_VEB		(u32)(1 << 12)



	/* Tx fast path data */

	int num_tx_queues;