diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-10 15:48:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-10 15:48:20 -0500 |
| commit | 22f10923dd39141785273e423b9acf347297e15f (patch) | |
| tree | cc1f19103817433a426b3e329d6326f5e9d8e8f7 /drivers/net/ethernet/amd/xgbe | |
| parent | 785c20a08bead1e58ad53f2dc324782da7a0c9ea (diff) | |
| parent | 69204cf7eb9c5a72067ce6922d4699378251d053 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
drivers/net/ethernet/renesas/sh_eth.c
Overlapping changes in both conflict cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 7 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c index 51b68d1299fe..a50891f52197 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c | |||
| @@ -473,7 +473,6 @@ static void xgbe_unmap_rdata(struct xgbe_prv_data *pdata, | |||
| 473 | memset(&rdata->tx, 0, sizeof(rdata->tx)); | 473 | memset(&rdata->tx, 0, sizeof(rdata->tx)); |
| 474 | memset(&rdata->rx, 0, sizeof(rdata->rx)); | 474 | memset(&rdata->rx, 0, sizeof(rdata->rx)); |
| 475 | 475 | ||
| 476 | rdata->interrupt = 0; | ||
| 477 | rdata->mapped_as_page = 0; | 476 | rdata->mapped_as_page = 0; |
| 478 | 477 | ||
| 479 | if (rdata->state_saved) { | 478 | if (rdata->state_saved) { |
| @@ -597,7 +596,11 @@ static int xgbe_map_tx_skb(struct xgbe_channel *channel, struct sk_buff *skb) | |||
| 597 | } | 596 | } |
| 598 | } | 597 | } |
| 599 | 598 | ||
| 600 | /* Save the skb address in the last entry */ | 599 | /* Save the skb address in the last entry. We always have some data |
| 600 | * that has been mapped so rdata is always advanced past the last | ||
| 601 | * piece of mapped data - use the entry pointed to by cur_index - 1. | ||
| 602 | */ | ||
| 603 | rdata = XGBE_GET_DESC_DATA(ring, cur_index - 1); | ||
| 601 | rdata->skb = skb; | 604 | rdata->skb = skb; |
| 602 | 605 | ||
| 603 | /* Save the number of descriptor entries used */ | 606 | /* Save the number of descriptor entries used */ |
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index bf6bf1118b0f..7bb5f07dbeef 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c | |||
| @@ -1839,7 +1839,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel) | |||
| 1839 | spin_lock_irqsave(&ring->lock, flags); | 1839 | spin_lock_irqsave(&ring->lock, flags); |
| 1840 | 1840 | ||
| 1841 | while ((processed < XGBE_TX_DESC_MAX_PROC) && | 1841 | while ((processed < XGBE_TX_DESC_MAX_PROC) && |
| 1842 | (ring->dirty < ring->cur)) { | 1842 | (ring->dirty != ring->cur)) { |
| 1843 | rdata = XGBE_GET_DESC_DATA(ring, ring->dirty); | 1843 | rdata = XGBE_GET_DESC_DATA(ring, ring->dirty); |
| 1844 | rdesc = rdata->rdesc; | 1844 | rdesc = rdata->rdesc; |
| 1845 | 1845 | ||