Commit 579899a9 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 2014-10-02

This series contains updates to fm10k, igb, ixgbe and i40e.

Alex provides two updates to the fm10k driver.  First reduces the buffer
size to 2k for all page sizes, since most frames only have a 1500 MTU
so supporting a buffer size larger than this is somewhat wasteful.
Second fixes an issue where the number of transmit queues was not being
updated, so added the lines necessary to update the number of transmit
queues.

Rick Jones provides two patches to convert ixgbe, igb and i40e to use
dev_consume_skb_any().

Emil provides two patches for ixgbe, first cleans up a couple of wait
loops on auto-negotiation that were not needed.  Second fixes an issue
reported by Fujitsu/Red Hat, which consolidates the logic behind the
dynamically setting of TXDCTL.WTHRESH depending on interrupt throttle
rate (ITR) setting regardless of BQL.

Ethan Zhao provides a cleanup patch for ixgbe where he noticed a
duplicate define.

Bernhard Kaindl provides a patch for igb to remove a source of latency
spikes by not calling code that uses mdelay() for feeding a PHY stat
while being called with a spinlock held.

Todd bumps the igb version based on the recent changes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 48fea861 b5d130c4

drivers/net/ethernet/intel/fm10k/fm10k.h

+2 −6
Original line number Diff line number Diff line
@@ -47,13 +47,9 @@ 
#define FM10K_DEFAULT_TX_WORK	 256



#define FM10K_RXBUFFER_256	  256

#define FM10K_RXBUFFER_16384	16384

#define FM10K_RX_HDR_LEN	FM10K_RXBUFFER_256

#if PAGE_SIZE <= FM10K_RXBUFFER_16384

#define FM10K_RX_BUFSZ		(PAGE_SIZE / 2)

#else

#define FM10K_RX_BUFSZ		FM10K_RXBUFFER_16384

#endif

#define FM10K_RXBUFFER_2048	 2048

#define FM10K_RX_BUFSZ		FM10K_RXBUFFER_2048



/* How many Rx Buffers do we bundle into one write to the hardware ? */

#define FM10K_RX_BUFFER_WRITE	16	/* Must be power of 2 */

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

+5 −1
Original line number Diff line number Diff line
@@ -546,6 +546,10 @@ int fm10k_open(struct net_device *netdev) 
	fm10k_request_glort_range(interface);



	/* Notify the stack of the actual queue counts */

	err = netif_set_real_num_tx_queues(netdev,

					   interface->num_tx_queues);

	if (err)

		goto err_set_queues;



	err = netif_set_real_num_rx_queues(netdev,

					   interface->num_rx_queues);
@@ -601,7 +605,7 @@ int fm10k_close(struct net_device *netdev) 
static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)

{

	struct fm10k_intfc *interface = netdev_priv(dev);

	unsigned int r_idx = 0;

	unsigned int r_idx = skb->queue_mapping;

	int err;



	if ((skb->protocol ==  htons(ETH_P_8021Q)) &&

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

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget) 
		total_packets += tx_buf->gso_segs;



		/* free the skb */

		dev_kfree_skb_any(tx_buf->skb);

		dev_consume_skb_any(tx_buf->skb);



		/* unmap skb header data */

		dma_unmap_single(tx_ring->dev,

drivers/net/ethernet/intel/igb/e1000_hw.h

+0 −5
Original line number Diff line number Diff line
@@ -265,11 +265,6 @@ struct e1000_hw_stats { 
	u64 b2ogprc;

};



struct e1000_phy_stats {

	u32 idle_errors;

	u32 receive_errors;

};



struct e1000_host_mng_dhcp_cookie {

	u32 signature;

	u8  status;

drivers/net/ethernet/intel/igb/igb.h

+0 −1
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ struct igb_adapter { 
	struct e1000_hw hw;

	struct e1000_hw_stats stats;

	struct e1000_phy_info phy_info;

	struct e1000_phy_stats phy_stats;



	u32 test_icr;

	struct igb_ring test_tx_ring;

CRA Git | Maintained and supported by SUSTech CRA and CCSE