diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-05-30 21:39:51 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-06-02 15:13:12 +0200 |
| commit | 2328977fed81cf2fc367d8eea2f9bf04e51a761f (patch) | |
| tree | b6e2e89fcc861cf7fdba5e2979d7458ce912a348 /target/linux/mvebu/patches-4.4/147-net-mvneta-add-BQL-support.patch | |
| parent | 6e47c22268d5c89971950052aceda03810c88c75 (diff) | |
| download | upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.gz upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.bz2 upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.zip | |
kernel: bump kernel 4.4 to 4.4.135 for 17.01
* Refreshed patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/147-net-mvneta-add-BQL-support.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/147-net-mvneta-add-BQL-support.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/mvebu/patches-4.4/147-net-mvneta-add-BQL-support.patch b/target/linux/mvebu/patches-4.4/147-net-mvneta-add-BQL-support.patch index 7bd2593537..070f671e39 100644 --- a/target/linux/mvebu/patches-4.4/147-net-mvneta-add-BQL-support.patch +++ b/target/linux/mvebu/patches-4.4/147-net-mvneta-add-BQL-support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -1695,8 +1695,10 @@ static struct mvneta_tx_queue *mvneta_tx +@@ -1696,8 +1696,10 @@ static struct mvneta_tx_queue *mvneta_tx /* Free tx queue skbuffs */ static void mvneta_txq_bufs_free(struct mvneta_port *pp, @@ -12,7 +12,7 @@ int i; for (i = 0; i < num; i++) { -@@ -1704,6 +1706,11 @@ static void mvneta_txq_bufs_free(struct +@@ -1705,6 +1707,11 @@ static void mvneta_txq_bufs_free(struct txq->txq_get_index; struct sk_buff *skb = txq->tx_skb[txq->txq_get_index]; @@ -24,7 +24,7 @@ mvneta_txq_inc_get(txq); if (!IS_TSO_HEADER(txq, tx_desc->buf_phys_addr)) -@@ -1714,6 +1721,8 @@ static void mvneta_txq_bufs_free(struct +@@ -1715,6 +1722,8 @@ static void mvneta_txq_bufs_free(struct continue; dev_kfree_skb_any(skb); } @@ -33,7 +33,7 @@ } /* Handle end of transmission */ -@@ -1727,7 +1736,7 @@ static void mvneta_txq_done(struct mvnet +@@ -1728,7 +1737,7 @@ static void mvneta_txq_done(struct mvnet if (!tx_done) return; @@ -42,7 +42,7 @@ txq->count -= tx_done; -@@ -2334,6 +2343,8 @@ out: +@@ -2335,6 +2344,8 @@ out: struct mvneta_pcpu_stats *stats = this_cpu_ptr(pp->stats); struct netdev_queue *nq = netdev_get_tx_queue(dev, txq_id); @@ -51,7 +51,7 @@ txq->count += frags; mvneta_txq_pend_desc_add(pp, txq, frags); -@@ -2358,9 +2369,10 @@ static void mvneta_txq_done_force(struct +@@ -2359,9 +2370,10 @@ static void mvneta_txq_done_force(struct struct mvneta_tx_queue *txq) { @@ -63,7 +63,7 @@ /* reset txq */ txq->count = 0; -@@ -2841,6 +2853,8 @@ static int mvneta_txq_init(struct mvneta +@@ -2842,6 +2854,8 @@ static int mvneta_txq_init(struct mvneta static void mvneta_txq_deinit(struct mvneta_port *pp, struct mvneta_tx_queue *txq) { @@ -72,7 +72,7 @@ kfree(txq->tx_skb); if (txq->tso_hdrs) -@@ -2852,6 +2866,8 @@ static void mvneta_txq_deinit(struct mvn +@@ -2853,6 +2867,8 @@ static void mvneta_txq_deinit(struct mvn txq->size * MVNETA_DESC_ALIGNED_SIZE, txq->descs, txq->descs_phys); |