Merge branch 'amd-xgbe' (6000df00) · Commits · 戴 / test

Tom Lendacky says: ==================== amd-xgbe: AMD XGBE driver fixes 2014-12-02 The following series of patches includes two bug fixes. Unfortunately, the first patch will create a conflict when eventually merged into net-next but should be very easy to resolve. - Do not clear the interrupt bit in the xgbe_ring_data structure - Associate a Tx SKB with the proper xgbe_ring_data structure This patch series is based on net. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/amd/xgbe/xgbe-desc.c

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -356,7 +356,6 @@ static void xgbe_unmap_skb(struct xgbe_prv_data *pdata,

	rdata->tso_header = 0;		rdata->tso_header = 0;
	rdata->len = 0;		rdata->len = 0;
	rdata->interrupt = 0;
	rdata->mapped_as_page = 0;		rdata->mapped_as_page = 0;

	if (rdata->state_saved) {		if (rdata->state_saved) {
	@@ -481,7 +480,11 @@ static int xgbe_map_tx_skb(struct xgbe_channel channel, struct sk_buff skb)
	}		}
	}		}

	/* Save the skb address in the last entry */		/* Save the skb address in the last entry. We always have some data
			* that has been mapped so rdata is always advanced past the last
			* piece of mapped data - use the entry pointed to by cur_index - 1.
			*/
			rdata = XGBE_GET_DESC_DATA(ring, cur_index - 1);
	rdata->skb = skb;		rdata->skb = skb;

	/* Save the number of descriptor entries used */		/* Save the number of descriptor entries used */

Admin message