kernel: update kernel 4.4 to version 4.4.110

[openwrt/openwrt.git] / target / linux / mvebu / patches-4.4 / 147-net-mvneta-add-BQL-support.patch

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 7bd25935378e45b4083653c28b920ebe26e9c1b1..5405eefc9f80b8f5e279402defc04ab51fe3ab7b 100644 (file)
--- 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
+@@ -1699,8 +1699,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
+@@ -1708,6 +1710,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
+@@ -1718,6 +1725,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
+@@ -1731,7 +1740,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:
+@@ -2338,6 +2347,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
+@@ -2362,9 +2373,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
+@@ -2845,6 +2857,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
+@@ -2856,6 +2870,8 @@ static void mvneta_txq_deinit(struct mvn
                                  txq->size * MVNETA_DESC_ALIGNED_SIZE,
                                  txq->descs, txq->descs_phys);