kernel: bump kernel 4.4 to 4.4.135 for 17.01

* Refreshed patches

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

27 files changed, 138 insertions, 138 deletions

diff --git a/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch b/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
index fbee3d2887..1811e6920f 100644
--- a/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
+++ b/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -1071,15 +1071,28 @@ static void mvneta_defaults_set(struct m
+@@ -1072,15 +1072,28 @@ static void mvneta_defaults_set(struct m
  		       MVNETA_GMAC_AN_SPEED_EN |
  		       MVNETA_GMAC_AN_DUPLEX_EN;
  		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	mvneta_set_ucast_table(pp, -1);
-@@ -3232,9 +3245,6 @@ static int mvneta_port_power_up(struct m
+@@ -3233,9 +3246,6 @@ static int mvneta_port_power_up(struct m
  		return -EINVAL;
  	}
  
diff --git a/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch b/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
index 3154d7cfbe..2037a139c4 100644
--- a/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
+++ b/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	u64 ethtool_stats[ARRAY_SIZE(mvneta_statistics)];
  };
-@@ -977,6 +977,44 @@ static void mvneta_set_other_mcast_table
+@@ -978,6 +978,44 @@ static void mvneta_set_other_mcast_table
  		mvreg_write(pp, MVNETA_DA_FILT_OTH_MCAST + offset, val);
  }
  
@@ -77,7 +77,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  /* This method sets defaults to the NETA port:
   *	Clears interrupt Cause and Mask registers.
   *	Clears all MAC tables.
-@@ -1062,39 +1100,7 @@ static void mvneta_defaults_set(struct m
+@@ -1063,39 +1101,7 @@ static void mvneta_defaults_set(struct m
  	val &= ~MVNETA_PHY_POLLING_ENABLE;
  	mvreg_write(pp, MVNETA_UNIT_CONTROL, val);
  
@@ -118,7 +118,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvneta_set_ucast_table(pp, -1);
  	mvneta_set_special_mcast_table(pp, -1);
  	mvneta_set_other_mcast_table(pp, -1);
-@@ -2958,10 +2964,43 @@ int mvneta_ethtool_get_settings(struct n
+@@ -2959,10 +2965,43 @@ int mvneta_ethtool_get_settings(struct n
  int mvneta_ethtool_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
  	struct mvneta_port *pp = netdev_priv(dev);
diff --git a/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch b/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch
index 3be47abc8a..f02f05b77c 100644
--- a/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch
+++ b/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch
@@ -19,16 +19,16 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* Core clock */
  	struct clk *clk;
-@@ -819,7 +820,7 @@ static void mvneta_port_up(struct mvneta
- 	mvreg_write(pp, MVNETA_TXQ_CMD, q_map);
+@@ -820,7 +821,7 @@ static void mvneta_port_up(struct mvneta
  
+ 	q_map = 0;
  	/* Enable all initialized RXQs. */
 -	mvreg_write(pp, MVNETA_RXQ_CMD, BIT(rxq_def));
 +	mvreg_write(pp, MVNETA_RXQ_CMD, BIT(pp->rxq_def));
  }
  
  /* Stop the Ethernet port activity */
-@@ -1071,7 +1072,7 @@ static void mvneta_defaults_set(struct m
+@@ -1072,7 +1073,7 @@ static void mvneta_defaults_set(struct m
  	mvreg_write(pp, MVNETA_ACC_MODE, val);
  
  	/* Update val of portCfg register accordingly with all RxQueue types */
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvreg_write(pp, MVNETA_PORT_CONFIG, val);
  
  	val = 0;
-@@ -2105,19 +2106,19 @@ static void mvneta_set_rx_mode(struct ne
+@@ -2106,19 +2107,19 @@ static void mvneta_set_rx_mode(struct ne
  	if (dev->flags & IFF_PROMISC) {
  		/* Accept all: Multicast + Unicast */
  		mvneta_rx_unicast_promisc_set(pp, 1);
@@ -63,7 +63,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		} else {
  			/* Accept only initialized multicast */
  			mvneta_set_special_mcast_table(pp, -1);
-@@ -2126,7 +2127,7 @@ static void mvneta_set_rx_mode(struct ne
+@@ -2127,7 +2128,7 @@ static void mvneta_set_rx_mode(struct ne
  			if (!netdev_mc_empty(dev)) {
  				netdev_for_each_mc_addr(ha, dev) {
  					mvneta_mcast_addr_set(pp, ha->addr,
@@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  				}
  			}
  		}
-@@ -2209,7 +2210,7 @@ static int mvneta_poll(struct napi_struc
+@@ -2210,7 +2211,7 @@ static int mvneta_poll(struct napi_struc
  	 * RX packets
  	 */
  	cause_rx_tx |= port->cause_rx_tx;
@@ -81,7 +81,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	budget -= rx_done;
  
  	if (budget > 0) {
-@@ -2422,17 +2423,17 @@ static void mvneta_cleanup_txqs(struct m
+@@ -2423,17 +2424,17 @@ static void mvneta_cleanup_txqs(struct m
  /* Cleanup all Rx queues */
  static void mvneta_cleanup_rxqs(struct mvneta_port *pp)
  {
@@ -102,7 +102,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		mvneta_cleanup_rxqs(pp);
  		return err;
  	}
-@@ -2638,7 +2639,7 @@ static int mvneta_set_mac_addr(struct ne
+@@ -2639,7 +2640,7 @@ static int mvneta_set_mac_addr(struct ne
  	mvneta_mac_addr_set(pp, dev->dev_addr, -1);
  
  	/* Set new addr in hw */
@@ -111,7 +111,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	eth_commit_mac_addr_change(dev, addr);
  	return 0;
-@@ -2757,7 +2758,7 @@ static void mvneta_percpu_elect(struct m
+@@ -2758,7 +2759,7 @@ static void mvneta_percpu_elect(struct m
  {
  	int online_cpu_idx, cpu, i = 0;
  
@@ -120,7 +120,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	for_each_online_cpu(cpu) {
  		if (i == online_cpu_idx)
-@@ -3365,6 +3366,8 @@ static int mvneta_probe(struct platform_
+@@ -3366,6 +3367,8 @@ static int mvneta_probe(struct platform_
  				 strcmp(managed, "in-band-status") == 0);
  	pp->cpu_notifier.notifier_call = mvneta_percpu_notifier;
  
diff --git a/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch b/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
index a08d5fdcba..a3966948b6 100644
--- a/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
+++ b/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
@@ -32,9 +32,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  #define MVNETA_INTR_NEW_CAUSE                    0x25a0
  #define MVNETA_INTR_NEW_MASK                     0x25a4
-@@ -820,7 +827,13 @@ static void mvneta_port_up(struct mvneta
- 	mvreg_write(pp, MVNETA_TXQ_CMD, q_map);
+@@ -821,7 +828,13 @@ static void mvneta_port_up(struct mvneta
  
+ 	q_map = 0;
  	/* Enable all initialized RXQs. */
 -	mvreg_write(pp, MVNETA_RXQ_CMD, BIT(pp->rxq_def));
 +	for (queue = 0; queue < rxq_number; queue++) {
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  /* Stop the Ethernet port activity */
-@@ -1030,6 +1043,7 @@ static void mvneta_defaults_set(struct m
+@@ -1031,6 +1044,7 @@ static void mvneta_defaults_set(struct m
  	int cpu;
  	int queue;
  	u32 val;
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* Clear all Cause registers */
  	mvreg_write(pp, MVNETA_INTR_NEW_CAUSE, 0);
-@@ -1045,13 +1059,23 @@ static void mvneta_defaults_set(struct m
+@@ -1046,13 +1060,23 @@ static void mvneta_defaults_set(struct m
  	/* Enable MBUS Retry bit16 */
  	mvreg_write(pp, MVNETA_MBUS_RETRY, 0x20);
  
@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* Reset RX and TX DMAs */
  	mvreg_write(pp, MVNETA_PORT_RX_RESET, MVNETA_PORT_RX_DMA_RESET);
-@@ -2178,6 +2202,7 @@ static int mvneta_poll(struct napi_struc
+@@ -2179,6 +2203,7 @@ static int mvneta_poll(struct napi_struc
  {
  	int rx_done = 0;
  	u32 cause_rx_tx;
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	struct mvneta_port *pp = netdev_priv(napi->dev);
  	struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports);
  
-@@ -2209,8 +2234,15 @@ static int mvneta_poll(struct napi_struc
+@@ -2210,8 +2235,15 @@ static int mvneta_poll(struct napi_struc
  	/* For the case where the last mvneta_poll did not process all
  	 * RX packets
  	 */
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	budget -= rx_done;
  
  	if (budget > 0) {
-@@ -2423,19 +2455,27 @@ static void mvneta_cleanup_txqs(struct m
+@@ -2424,19 +2456,27 @@ static void mvneta_cleanup_txqs(struct m
  /* Cleanup all Rx queues */
  static void mvneta_cleanup_rxqs(struct mvneta_port *pp)
  {
@@ -145,7 +145,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	return 0;
-@@ -2459,6 +2499,19 @@ static int mvneta_setup_txqs(struct mvne
+@@ -2460,6 +2500,19 @@ static int mvneta_setup_txqs(struct mvne
  	return 0;
  }
  
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void mvneta_start_dev(struct mvneta_port *pp)
  {
  	unsigned int cpu;
-@@ -2476,11 +2529,10 @@ static void mvneta_start_dev(struct mvne
+@@ -2477,11 +2530,10 @@ static void mvneta_start_dev(struct mvne
  		napi_enable(&port->napi);
  	}
  
@@ -181,7 +181,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvreg_write(pp, MVNETA_INTR_MISC_MASK,
  		    MVNETA_CAUSE_PHY_STATUS_CHANGE |
  		    MVNETA_CAUSE_LINK_CHANGE |
-@@ -2756,22 +2808,35 @@ static void mvneta_percpu_disable(void *
+@@ -2757,22 +2809,35 @@ static void mvneta_percpu_disable(void *
  
  static void mvneta_percpu_elect(struct mvneta_port *pp)
  {
@@ -227,7 +227,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  };
  
-@@ -2806,12 +2871,22 @@ static int mvneta_percpu_notifier(struct
+@@ -2807,12 +2872,22 @@ static int mvneta_percpu_notifier(struct
  		mvreg_write(pp, MVNETA_INTR_MISC_MASK, 0);
  		napi_enable(&port->napi);
  
@@ -251,7 +251,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		mvreg_write(pp, MVNETA_INTR_NEW_MASK,
  			MVNETA_RX_INTR_MASK(rxq_number) |
  			MVNETA_TX_INTR_MASK(txq_number) |
-@@ -2862,7 +2937,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2863,7 +2938,7 @@ static int mvneta_percpu_notifier(struct
  static int mvneta_open(struct net_device *dev)
  {
  	struct mvneta_port *pp = netdev_priv(dev);
@@ -260,7 +260,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);
  	pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
-@@ -2892,8 +2967,13 @@ static int mvneta_open(struct net_device
+@@ -2893,8 +2968,13 @@ static int mvneta_open(struct net_device
  	 */
  	mvneta_percpu_disable(pp);
  
diff --git a/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch b/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch
index ee2c71b5e9..ced1eba8ef 100644
--- a/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch
+++ b/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch
@@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  /* The mvneta_tx_desc and mvneta_rx_desc structures describe the
-@@ -1071,7 +1078,7 @@ static void mvneta_defaults_set(struct m
+@@ -1072,7 +1079,7 @@ static void mvneta_defaults_set(struct m
  			if ((rxq % max_cpu) == cpu)
  				rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq);
  
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			txq_map = MVNETA_CPU_TXQ_ACCESS_ALL_MASK;
  
  		mvreg_write(pp, MVNETA_CPU_MAP(cpu), rxq_map | txq_map);
-@@ -2512,6 +2519,18 @@ static void mvneta_percpu_unmask_interru
+@@ -2513,6 +2520,18 @@ static void mvneta_percpu_unmask_interru
  		    MVNETA_MISCINTR_INTR_MASK);
  }
  
@@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void mvneta_start_dev(struct mvneta_port *pp)
  {
  	unsigned int cpu;
-@@ -3233,6 +3252,106 @@ static int mvneta_ethtool_get_sset_count
+@@ -3234,6 +3253,106 @@ static int mvneta_ethtool_get_sset_count
  	return -EOPNOTSUPP;
  }
  
@@ -169,7 +169,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static const struct net_device_ops mvneta_netdev_ops = {
  	.ndo_open            = mvneta_open,
  	.ndo_stop            = mvneta_stop,
-@@ -3257,6 +3376,10 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -3258,6 +3377,10 @@ const struct ethtool_ops mvneta_eth_tool
  	.get_strings	= mvneta_ethtool_get_strings,
  	.get_ethtool_stats = mvneta_ethtool_get_stats,
  	.get_sset_count	= mvneta_ethtool_get_sset_count,
@@ -180,7 +180,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  /* Initialize hw */
-@@ -3448,6 +3571,8 @@ static int mvneta_probe(struct platform_
+@@ -3449,6 +3572,8 @@ static int mvneta_probe(struct platform_
  
  	pp->rxq_def = rxq_def;
  
diff --git a/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch b/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch
index 7389466b6d..0fa6e64925 100644
--- a/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch
+++ b/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  struct mvneta_rx_queue {
-@@ -1066,20 +1070,30 @@ static void mvneta_defaults_set(struct m
+@@ -1067,20 +1071,30 @@ static void mvneta_defaults_set(struct m
  	/* Enable MBUS Retry bit16 */
  	mvreg_write(pp, MVNETA_MBUS_RETRY, 0x20);
  
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  		mvreg_write(pp, MVNETA_CPU_MAP(cpu), rxq_map | txq_map);
  	}
-@@ -2366,6 +2380,8 @@ static void mvneta_rxq_deinit(struct mvn
+@@ -2367,6 +2381,8 @@ static void mvneta_rxq_deinit(struct mvn
  static int mvneta_txq_init(struct mvneta_port *pp,
  			   struct mvneta_tx_queue *txq)
  {
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	txq->size = pp->tx_ring_size;
  
  	/* A queue must always have room for at least one skb.
-@@ -2418,6 +2434,14 @@ static int mvneta_txq_init(struct mvneta
+@@ -2419,6 +2435,14 @@ static int mvneta_txq_init(struct mvneta
  	}
  	mvneta_tx_done_pkts_coal_set(pp, txq, txq->done_pkts_coal);
  
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	return 0;
  }
  
-@@ -2840,13 +2864,23 @@ static void mvneta_percpu_elect(struct m
+@@ -2841,13 +2865,23 @@ static void mvneta_percpu_elect(struct m
  			if ((rxq % max_cpu) == cpu)
  				rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq);
  
diff --git a/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch b/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch
index e79a11a4f1..2a00ea66fd 100644
--- a/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch
+++ b/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3244,26 +3244,25 @@ static void mvneta_ethtool_update_stats(
+@@ -3245,26 +3245,25 @@ static void mvneta_ethtool_update_stats(
  	const struct mvneta_statistic *s;
  	void __iomem *base = pp->base;
  	u32 high, low, val;
diff --git a/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch b/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
index 3423307c1c..b72b823671 100644
--- a/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
+++ b/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -2851,9 +2851,14 @@ static void mvneta_percpu_disable(void *
+@@ -2852,9 +2852,14 @@ static void mvneta_percpu_disable(void *
  
  static void mvneta_percpu_elect(struct mvneta_port *pp)
  {
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	max_cpu = num_present_cpus();
  
  	for_each_online_cpu(cpu) {
-@@ -2864,7 +2869,7 @@ static void mvneta_percpu_elect(struct m
+@@ -2865,7 +2870,7 @@ static void mvneta_percpu_elect(struct m
  			if ((rxq % max_cpu) == cpu)
  				rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq);
  
@@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			/* Map the default receive queue queue to the
  			 * elected CPU
  			 */
-@@ -2875,7 +2880,7 @@ static void mvneta_percpu_elect(struct m
+@@ -2876,7 +2881,7 @@ static void mvneta_percpu_elect(struct m
  		 * the CPU bound to the default RX queue
  		 */
  		if (txq_number == 1)
diff --git a/target/linux/mvebu/patches-4.4/039-net-mvneta-Use-on_each_cpu-when-possible.patch b/target/linux/mvebu/patches-4.4/039-net-mvneta-Use-on_each_cpu-when-possible.patch
index 8d22df0f9c..42ef706002 100644
--- a/target/linux/mvebu/patches-4.4/039-net-mvneta-Use-on_each_cpu-when-possible.patch
+++ b/target/linux/mvebu/patches-4.4/039-net-mvneta-Use-on_each_cpu-when-possible.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -2557,7 +2557,7 @@ static void mvneta_percpu_mask_interrupt
+@@ -2558,7 +2558,7 @@ static void mvneta_percpu_mask_interrupt
  
  static void mvneta_start_dev(struct mvneta_port *pp)
  {
@@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	mvneta_max_rx_size_set(pp, pp->pkt_size);
  	mvneta_txq_max_tx_size_set(pp, pp->pkt_size);
-@@ -2573,9 +2573,8 @@ static void mvneta_start_dev(struct mvne
+@@ -2574,9 +2574,8 @@ static void mvneta_start_dev(struct mvne
  	}
  
  	/* Unmask interrupts. It has to be done from each CPU */
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvreg_write(pp, MVNETA_INTR_MISC_MASK,
  		    MVNETA_CAUSE_PHY_STATUS_CHANGE |
  		    MVNETA_CAUSE_LINK_CHANGE |
-@@ -2995,7 +2994,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2996,7 +2995,7 @@ static int mvneta_percpu_notifier(struct
  static int mvneta_open(struct net_device *dev)
  {
  	struct mvneta_port *pp = netdev_priv(dev);
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);
  	pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
-@@ -3028,9 +3027,7 @@ static int mvneta_open(struct net_device
+@@ -3029,9 +3028,7 @@ static int mvneta_open(struct net_device
  	/* Enable per-CPU interrupt on all the CPU to handle our RX
  	 * queue interrupts
  	 */
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  
  	/* Register a CPU notifier to handle the case where our CPU
-@@ -3317,9 +3314,7 @@ static int  mvneta_config_rss(struct mvn
+@@ -3318,9 +3315,7 @@ static int  mvneta_config_rss(struct mvn
  
  	netif_tx_stop_all_queues(pp->dev);
  
diff --git a/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch b/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
index acb6c94bb2..c589413107 100644
--- a/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
+++ b/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -1040,6 +1040,43 @@ static void mvneta_set_autoneg(struct mv
+@@ -1041,6 +1041,43 @@ static void mvneta_set_autoneg(struct mv
  	}
  }
  
@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  /* This method sets defaults to the NETA port:
   *	Clears interrupt Cause and Mask registers.
   *	Clears all MAC tables.
-@@ -1057,14 +1094,10 @@ static void mvneta_defaults_set(struct m
+@@ -1058,14 +1095,10 @@ static void mvneta_defaults_set(struct m
  	int max_cpu = num_present_cpus();
  
  	/* Clear all Cause registers */
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvreg_write(pp, MVNETA_INTR_ENABLE, 0);
  
  	/* Enable MBUS Retry bit16 */
-@@ -2530,31 +2563,6 @@ static int mvneta_setup_txqs(struct mvne
+@@ -2531,31 +2564,6 @@ static int mvneta_setup_txqs(struct mvne
  	return 0;
  }
  
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void mvneta_start_dev(struct mvneta_port *pp)
  {
  	int cpu;
-@@ -2605,13 +2613,10 @@ static void mvneta_stop_dev(struct mvnet
+@@ -2606,13 +2614,10 @@ static void mvneta_stop_dev(struct mvnet
  	mvneta_port_disable(pp);
  
  	/* Clear all ethernet port interrupts */
@@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	mvneta_tx_reset(pp);
  	mvneta_rx_reset(pp);
-@@ -2923,9 +2928,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2924,9 +2929,7 @@ static int mvneta_percpu_notifier(struct
  		}
  
  		/* Mask all ethernet port interrupts */
@@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		napi_enable(&port->napi);
  
  
-@@ -2940,14 +2943,8 @@ static int mvneta_percpu_notifier(struct
+@@ -2941,14 +2944,8 @@ static int mvneta_percpu_notifier(struct
  		 */
  		mvneta_percpu_elect(pp);
  
@@ -154,7 +154,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		mvreg_write(pp, MVNETA_INTR_MISC_MASK,
  			MVNETA_CAUSE_PHY_STATUS_CHANGE |
  			MVNETA_CAUSE_LINK_CHANGE |
-@@ -2958,9 +2955,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2959,9 +2956,7 @@ static int mvneta_percpu_notifier(struct
  	case CPU_DOWN_PREPARE_FROZEN:
  		netif_tx_stop_all_queues(pp->dev);
  		/* Mask all ethernet port interrupts */
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  		napi_synchronize(&port->napi);
  		napi_disable(&port->napi);
-@@ -2976,10 +2971,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2977,10 +2972,7 @@ static int mvneta_percpu_notifier(struct
  		/* Check if a new CPU must be elected now this on is down */
  		mvneta_percpu_elect(pp);
  		/* Unmask all ethernet port interrupts */
diff --git a/target/linux/mvebu/patches-4.4/041-net-mvneta-The-mvneta_percpu_elect-function-should-b.patch b/target/linux/mvebu/patches-4.4/041-net-mvneta-The-mvneta_percpu_elect-function-should-b.patch
index 1d3d6aaf14..f2a30b33aa 100644
--- a/target/linux/mvebu/patches-4.4/041-net-mvneta-The-mvneta_percpu_elect-function-should-b.patch
+++ b/target/linux/mvebu/patches-4.4/041-net-mvneta-The-mvneta_percpu_elect-function-should-b.patch
@@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* Core clock */
  	struct clk *clk;
-@@ -2857,6 +2861,12 @@ static void mvneta_percpu_elect(struct m
+@@ -2858,6 +2862,12 @@ static void mvneta_percpu_elect(struct m
  {
  	int elected_cpu = 0, max_cpu, cpu, i = 0;
  
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	/* Use the cpu associated to the rxq when it is online, in all
  	 * the other cases, use the cpu 0 which can't be offline.
  	 */
-@@ -2900,6 +2910,7 @@ static void mvneta_percpu_elect(struct m
+@@ -2901,6 +2911,7 @@ static void mvneta_percpu_elect(struct m
  		i++;
  
  	}
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static int mvneta_percpu_notifier(struct notifier_block *nfb,
-@@ -2954,8 +2965,13 @@ static int mvneta_percpu_notifier(struct
+@@ -2955,8 +2966,13 @@ static int mvneta_percpu_notifier(struct
  	case CPU_DOWN_PREPARE:
  	case CPU_DOWN_PREPARE_FROZEN:
  		netif_tx_stop_all_queues(pp->dev);
diff --git a/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch b/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
index 878229cbf7..efdd08427c 100644
--- a/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
+++ b/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* Core clock */
  	struct clk *clk;
-@@ -2857,16 +2858,14 @@ static void mvneta_percpu_disable(void *
+@@ -2858,16 +2859,14 @@ static void mvneta_percpu_disable(void *
  	disable_percpu_irq(pp->dev->irq);
  }
  
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	/* Use the cpu associated to the rxq when it is online, in all
  	 * the other cases, use the cpu 0 which can't be offline.
  	 */
-@@ -2910,7 +2909,6 @@ static void mvneta_percpu_elect(struct m
+@@ -2911,7 +2910,6 @@ static void mvneta_percpu_elect(struct m
  		i++;
  
  	}
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static int mvneta_percpu_notifier(struct notifier_block *nfb,
-@@ -2924,6 +2922,14 @@ static int mvneta_percpu_notifier(struct
+@@ -2925,6 +2923,14 @@ static int mvneta_percpu_notifier(struct
  	switch (action) {
  	case CPU_ONLINE:
  	case CPU_ONLINE_FROZEN:
@@ -70,7 +70,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		netif_tx_stop_all_queues(pp->dev);
  
  		/* We have to synchronise on tha napi of each CPU
-@@ -2961,6 +2967,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2962,6 +2968,7 @@ static int mvneta_percpu_notifier(struct
  			MVNETA_CAUSE_LINK_CHANGE |
  			MVNETA_CAUSE_PSC_SYNC_CHANGE);
  		netif_tx_start_all_queues(pp->dev);
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		break;
  	case CPU_DOWN_PREPARE:
  	case CPU_DOWN_PREPARE_FROZEN:
-@@ -2985,7 +2992,9 @@ static int mvneta_percpu_notifier(struct
+@@ -2986,7 +2993,9 @@ static int mvneta_percpu_notifier(struct
  	case CPU_DEAD:
  	case CPU_DEAD_FROZEN:
  		/* Check if a new CPU must be elected now this on is down */
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		/* Unmask all ethernet port interrupts */
  		on_each_cpu(mvneta_percpu_unmask_interrupt, pp, true);
  		mvreg_write(pp, MVNETA_INTR_MISC_MASK,
-@@ -3037,7 +3046,7 @@ static int mvneta_open(struct net_device
+@@ -3038,7 +3047,7 @@ static int mvneta_open(struct net_device
  	 */
  	on_each_cpu(mvneta_percpu_enable, pp, true);
  
@@ -97,7 +97,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	/* Register a CPU notifier to handle the case where our CPU
  	 * might be taken offline.
  	 */
-@@ -3070,9 +3079,18 @@ static int mvneta_stop(struct net_device
+@@ -3071,9 +3080,18 @@ static int mvneta_stop(struct net_device
  {
  	struct mvneta_port *pp = netdev_priv(dev);
  
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	on_each_cpu(mvneta_percpu_disable, pp, true);
  	free_percpu_irq(dev->irq, pp->ports);
  	mvneta_cleanup_rxqs(pp);
-@@ -3343,7 +3361,9 @@ static int  mvneta_config_rss(struct mvn
+@@ -3344,7 +3362,9 @@ static int  mvneta_config_rss(struct mvn
  	mvreg_write(pp, MVNETA_PORT_CONFIG, val);
  
  	/* Update the elected CPU matching the new rxq_def */
diff --git a/target/linux/mvebu/patches-4.4/045-net-mvneta-bm-add-support-for-hardware-buffer-manage.patch b/target/linux/mvebu/patches-4.4/045-net-mvneta-bm-add-support-for-hardware-buffer-manage.patch
index a1b5ca8c6a..b3c86cad7d 100644
--- a/target/linux/mvebu/patches-4.4/045-net-mvneta-bm-add-support-for-hardware-buffer-manage.patch
+++ b/target/linux/mvebu/patches-4.4/045-net-mvneta-bm-add-support-for-hardware-buffer-manage.patch
@@ -495,7 +495,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  /* Start the Ethernet port RX and TX activity */
  static void mvneta_port_up(struct mvneta_port *pp)
  {
-@@ -1151,9 +1383,17 @@ static void mvneta_defaults_set(struct m
+@@ -1152,9 +1384,17 @@ static void mvneta_defaults_set(struct m
  	mvreg_write(pp, MVNETA_PORT_RX_RESET, 0);
  
  	/* Set Port Acceleration Mode */
@@ -514,7 +514,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	/* Update val of portCfg register accordingly with all RxQueue types */
  	val = MVNETA_PORT_CONFIG_DEFL_VALUE(pp->rxq_def);
  	mvreg_write(pp, MVNETA_PORT_CONFIG, val);
-@@ -1520,23 +1760,25 @@ static void mvneta_txq_done(struct mvnet
+@@ -1521,23 +1761,25 @@ static void mvneta_txq_done(struct mvnet
  	}
  }
  
@@ -547,7 +547,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int mvneta_rx_refill(struct mvneta_port *pp,
  			    struct mvneta_rx_desc *rx_desc)
  
-@@ -1544,7 +1786,7 @@ static int mvneta_rx_refill(struct mvnet
+@@ -1545,7 +1787,7 @@ static int mvneta_rx_refill(struct mvnet
  	dma_addr_t phys_addr;
  	void *data;
  
@@ -556,7 +556,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	if (!data)
  		return -ENOMEM;
  
-@@ -1552,7 +1794,7 @@ static int mvneta_rx_refill(struct mvnet
+@@ -1553,7 +1795,7 @@ static int mvneta_rx_refill(struct mvnet
  				   MVNETA_RX_BUF_SIZE(pp->pkt_size),
  				   DMA_FROM_DEVICE);
  	if (unlikely(dma_mapping_error(pp->dev->dev.parent, phys_addr))) {
@@ -565,7 +565,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return -ENOMEM;
  	}
  
-@@ -1598,22 +1840,156 @@ static void mvneta_rxq_drop_pkts(struct
+@@ -1599,22 +1841,156 @@ static void mvneta_rxq_drop_pkts(struct
  	int rx_done, i;
  
  	rx_done = mvneta_rxq_busy_desc_num_get(pp, rxq);
@@ -728,7 +728,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
  	struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports);
  	struct net_device *dev = pp->dev;
-@@ -1632,21 +2008,29 @@ static int mvneta_rx(struct mvneta_port
+@@ -1633,21 +2009,29 @@ static int mvneta_rx(struct mvneta_port
  	/* Fairness NAPI loop */
  	while (rx_done < rx_todo) {
  		struct mvneta_rx_desc *rx_desc = mvneta_rxq_next_desc_get(rxq);
@@ -760,7 +760,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			dev->stats.rx_errors++;
  			mvneta_rx_error(pp, rx_desc);
  			/* leave the descriptor untouched */
-@@ -1657,7 +2041,7 @@ static int mvneta_rx(struct mvneta_port
+@@ -1658,7 +2042,7 @@ static int mvneta_rx(struct mvneta_port
  			/* better copy a small frame and not unmap the DMA region */
  			skb = netdev_alloc_skb_ip_align(dev, rx_bytes);
  			if (unlikely(!skb))
@@ -769,7 +769,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  			dma_sync_single_range_for_cpu(dev->dev.parent,
  			                              rx_desc->buf_phys_addr,
-@@ -1675,26 +2059,31 @@ static int mvneta_rx(struct mvneta_port
+@@ -1676,26 +2060,31 @@ static int mvneta_rx(struct mvneta_port
  			rcvd_pkts++;
  			rcvd_bytes += rx_bytes;
  
@@ -807,7 +807,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		if (!skb)
  			goto err_drop_frame;
  
-@@ -2299,7 +2688,10 @@ static int mvneta_poll(struct napi_struc
+@@ -2300,7 +2689,10 @@ static int mvneta_poll(struct napi_struc
  
  	if (rx_queue) {
  		rx_queue = rx_queue - 1;
@@ -819,7 +819,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	budget -= rx_done;
-@@ -2388,9 +2780,17 @@ static int mvneta_rxq_init(struct mvneta
+@@ -2389,9 +2781,17 @@ static int mvneta_rxq_init(struct mvneta
  	mvneta_rx_pkts_coal_set(pp, rxq, rxq->pkts_coal);
  	mvneta_rx_time_coal_set(pp, rxq, rxq->time_coal);
  
@@ -840,7 +840,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvneta_rxq_fill(pp, rxq, rxq->size);
  
  	return 0;
-@@ -2663,6 +3063,9 @@ static int mvneta_change_mtu(struct net_
+@@ -2664,6 +3064,9 @@ static int mvneta_change_mtu(struct net_
  	dev->mtu = mtu;
  
  	if (!netif_running(dev)) {
@@ -850,7 +850,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		netdev_update_features(dev);
  		return 0;
  	}
-@@ -2675,6 +3078,9 @@ static int mvneta_change_mtu(struct net_
+@@ -2676,6 +3079,9 @@ static int mvneta_change_mtu(struct net_
  	mvneta_cleanup_txqs(pp);
  	mvneta_cleanup_rxqs(pp);
  
@@ -860,7 +860,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	pp->pkt_size = MVNETA_RX_PKT_SIZE(dev->mtu);
  	pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
  	                SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
-@@ -3567,6 +3973,7 @@ static int mvneta_probe(struct platform_
+@@ -3568,6 +3974,7 @@ static int mvneta_probe(struct platform_
  	struct resource *res;
  	struct device_node *dn = pdev->dev.of_node;
  	struct device_node *phy_node;
@@ -868,7 +868,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	struct mvneta_port *pp;
  	struct net_device *dev;
  	const char *dt_mac_addr;
-@@ -3694,26 +4101,39 @@ static int mvneta_probe(struct platform_
+@@ -3695,26 +4102,39 @@ static int mvneta_probe(struct platform_
  
  	pp->tx_csum_limit = tx_csum_limit;
  
@@ -914,7 +914,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	for_each_present_cpu(cpu) {
  		struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
  
-@@ -3748,6 +4168,13 @@ static int mvneta_probe(struct platform_
+@@ -3749,6 +4169,13 @@ static int mvneta_probe(struct platform_
  
  	return 0;
  
@@ -928,7 +928,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  err_free_stats:
  	free_percpu(pp->stats);
  err_free_ports:
-@@ -3777,6 +4204,12 @@ static int mvneta_remove(struct platform
+@@ -3778,6 +4205,12 @@ static int mvneta_remove(struct platform
  	of_node_put(pp->phy_node);
  	free_netdev(dev);
  
diff --git a/target/linux/mvebu/patches-4.4/046-net-mvneta-Use-the-new-hwbm-framework.patch b/target/linux/mvebu/patches-4.4/046-net-mvneta-Use-the-new-hwbm-framework.patch
index fb9859c5d2..889a119a02 100644
--- a/target/linux/mvebu/patches-4.4/046-net-mvneta-Use-the-new-hwbm-framework.patch
+++ b/target/linux/mvebu/patches-4.4/046-net-mvneta-Use-the-new-hwbm-framework.patch
@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		goto bm_mtu_err;
  	}
  	mvneta_bm_pool_bufsize_set(pp, bm_pool->buf_size, bm_pool->id);
-@@ -2068,14 +2070,14 @@ err_drop_frame:
+@@ -2069,14 +2071,14 @@ err_drop_frame:
  		}
  
  		/* Refill processing */
diff --git a/target/linux/mvebu/patches-4.4/047-net-mvneta-Fix-spinlock-usage.patch b/target/linux/mvebu/patches-4.4/047-net-mvneta-Fix-spinlock-usage.patch
index 7058686c20..54399a1b17 100644
--- a/target/linux/mvebu/patches-4.4/047-net-mvneta-Fix-spinlock-usage.patch
+++ b/target/linux/mvebu/patches-4.4/047-net-mvneta-Fix-spinlock-usage.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3488,17 +3488,17 @@ static int mvneta_stop(struct net_device
+@@ -3489,17 +3489,17 @@ static int mvneta_stop(struct net_device
  	struct mvneta_port *pp = netdev_priv(dev);
  
  	/* Inform that we are stopping so we don't want to setup the
@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	on_each_cpu(mvneta_percpu_disable, pp, true);
  	free_percpu_irq(dev->irq, pp->ports);
  	mvneta_cleanup_rxqs(pp);
-@@ -4031,6 +4031,7 @@ static int mvneta_probe(struct platform_
+@@ -4032,6 +4032,7 @@ static int mvneta_probe(struct platform_
  	dev->ethtool_ops = &mvneta_eth_tool_ops;
  
  	pp = netdev_priv(dev);
diff --git a/target/linux/mvebu/patches-4.4/048-net-mvneta-fix-error-messages-in-mvneta_port_down-fu.patch b/target/linux/mvebu/patches-4.4/048-net-mvneta-fix-error-messages-in-mvneta_port_down-fu.patch
index fd1f1ae203..edc11549e9 100644
--- a/target/linux/mvebu/patches-4.4/048-net-mvneta-fix-error-messages-in-mvneta_port_down-fu.patch
+++ b/target/linux/mvebu/patches-4.4/048-net-mvneta-fix-error-messages-in-mvneta_port_down-fu.patch
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -1105,7 +1105,7 @@ static void mvneta_port_down(struct mvne
+@@ -1106,7 +1106,7 @@ static void mvneta_port_down(struct mvne
  	do {
  		if (count++ >= MVNETA_RX_DISABLE_TIMEOUT_MSEC) {
  			netdev_warn(pp->dev,
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  				    val);
  			break;
  		}
-@@ -1144,7 +1144,7 @@ static void mvneta_port_down(struct mvne
+@@ -1145,7 +1145,7 @@ static void mvneta_port_down(struct mvne
  	do {
  		if (count++ >= MVNETA_TX_FIFO_EMPTY_TIMEOUT) {
  			netdev_warn(pp->dev,
diff --git a/target/linux/mvebu/patches-4.4/049-net-mvneta-replace-MVNETA_CPU_D_CACHE_LINE_SIZE-with.patch b/target/linux/mvebu/patches-4.4/049-net-mvneta-replace-MVNETA_CPU_D_CACHE_LINE_SIZE-with.patch
index 4b319e26a7..d72dcc847e 100644
--- a/target/linux/mvebu/patches-4.4/049-net-mvneta-replace-MVNETA_CPU_D_CACHE_LINE_SIZE-with.patch
+++ b/target/linux/mvebu/patches-4.4/049-net-mvneta-replace-MVNETA_CPU_D_CACHE_LINE_SIZE-with.patch
@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  #define IS_TSO_HEADER(txq, addr) \
  	((addr >= txq->tso_hdrs_phys) && \
-@@ -2766,9 +2765,6 @@ static int mvneta_rxq_init(struct mvneta
+@@ -2767,9 +2766,6 @@ static int mvneta_rxq_init(struct mvneta
  	if (rxq->descs == NULL)
  		return -ENOMEM;
  
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	rxq->last_desc = rxq->size - 1;
  
  	/* Set Rx descriptors queue starting address */
-@@ -2839,10 +2835,6 @@ static int mvneta_txq_init(struct mvneta
+@@ -2840,10 +2836,6 @@ static int mvneta_txq_init(struct mvneta
  	if (txq->descs == NULL)
  		return -ENOMEM;
  
diff --git a/target/linux/mvebu/patches-4.4/050-net-mvneta-fix-changing-MTU-when-using-per-cpu-proce.patch b/target/linux/mvebu/patches-4.4/050-net-mvneta-fix-changing-MTU-when-using-per-cpu-proce.patch
index fdc5663510..bcb0b4b8c7 100644
--- a/target/linux/mvebu/patches-4.4/050-net-mvneta-fix-changing-MTU-when-using-per-cpu-proce.patch
+++ b/target/linux/mvebu/patches-4.4/050-net-mvneta-fix-changing-MTU-when-using-per-cpu-proce.patch
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3044,6 +3044,20 @@ static int mvneta_check_mtu_valid(struct
+@@ -3045,6 +3045,20 @@ static int mvneta_check_mtu_valid(struct
  	return mtu;
  }
  
@@ -36,7 +36,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  /* Change the device mtu */
  static int mvneta_change_mtu(struct net_device *dev, int mtu)
  {
-@@ -3068,6 +3082,7 @@ static int mvneta_change_mtu(struct net_
+@@ -3069,6 +3083,7 @@ static int mvneta_change_mtu(struct net_
  	 * reallocation of the queues
  	 */
  	mvneta_stop_dev(pp);
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	mvneta_cleanup_txqs(pp);
  	mvneta_cleanup_rxqs(pp);
-@@ -3091,6 +3106,7 @@ static int mvneta_change_mtu(struct net_
+@@ -3092,6 +3107,7 @@ static int mvneta_change_mtu(struct net_
  		return ret;
  	}
  
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvneta_start_dev(pp);
  	mvneta_port_up(pp);
  
-@@ -3244,20 +3260,6 @@ static void mvneta_mdio_remove(struct mv
+@@ -3245,20 +3261,6 @@ static void mvneta_mdio_remove(struct mv
  	pp->phy_dev = NULL;
  }
  
diff --git a/target/linux/mvebu/patches-4.4/134-net-mvneta-convert-to-phylink.patch b/target/linux/mvebu/patches-4.4/134-net-mvneta-convert-to-phylink.patch
index 3bfaf1582e..380b6bf670 100644
--- a/target/linux/mvebu/patches-4.4/134-net-mvneta-convert-to-phylink.patch
+++ b/target/linux/mvebu/patches-4.4/134-net-mvneta-convert-to-phylink.patch
@@ -79,7 +79,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  
  	struct mvneta_bm *bm_priv;
  	struct mvneta_bm_pool *pool_long;
-@@ -1177,10 +1179,6 @@ static void mvneta_port_disable(struct m
+@@ -1178,10 +1180,6 @@ static void mvneta_port_disable(struct m
  	val &= ~MVNETA_GMAC0_PORT_ENABLE;
  	mvreg_write(pp, MVNETA_GMAC_CTRL_0, val);
  
@@ -90,7 +90,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	udelay(200);
  }
  
-@@ -1240,44 +1238,6 @@ static void mvneta_set_other_mcast_table
+@@ -1241,44 +1239,6 @@ static void mvneta_set_other_mcast_table
  		mvreg_write(pp, MVNETA_DA_FILT_OTH_MCAST + offset, val);
  }
  
@@ -135,7 +135,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  static void mvneta_percpu_unmask_interrupt(void *arg)
  {
  	struct mvneta_port *pp = arg;
-@@ -1425,7 +1385,6 @@ static void mvneta_defaults_set(struct m
+@@ -1426,7 +1386,6 @@ static void mvneta_defaults_set(struct m
  	val &= ~MVNETA_PHY_POLLING_ENABLE;
  	mvreg_write(pp, MVNETA_UNIT_CONTROL, val);
  
@@ -143,7 +143,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	mvneta_set_ucast_table(pp, -1);
  	mvneta_set_special_mcast_table(pp, -1);
  	mvneta_set_other_mcast_table(pp, -1);
-@@ -2618,26 +2577,11 @@ static irqreturn_t mvneta_isr(int irq, v
+@@ -2619,26 +2578,11 @@ static irqreturn_t mvneta_isr(int irq, v
  	return IRQ_HANDLED;
  }
  
@@ -172,7 +172,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  /* NAPI handler
-@@ -2666,12 +2610,11 @@ static int mvneta_poll(struct napi_struc
+@@ -2667,12 +2611,11 @@ static int mvneta_poll(struct napi_struc
  		u32 cause_misc = mvreg_read(pp, MVNETA_INTR_MISC_CAUSE);
  
  		mvreg_write(pp, MVNETA_INTR_MISC_CAUSE, 0);
@@ -190,7 +190,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	}
  
  	/* Release Tx descriptors */
-@@ -2987,7 +2930,7 @@ static void mvneta_start_dev(struct mvne
+@@ -2988,7 +2931,7 @@ static void mvneta_start_dev(struct mvne
  		    MVNETA_CAUSE_LINK_CHANGE |
  		    MVNETA_CAUSE_PSC_SYNC_CHANGE);
  
@@ -199,7 +199,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	netif_tx_start_all_queues(pp->dev);
  }
  
-@@ -2995,7 +2938,7 @@ static void mvneta_stop_dev(struct mvnet
+@@ -2996,7 +2939,7 @@ static void mvneta_stop_dev(struct mvnet
  {
  	unsigned int cpu;
  
@@ -208,7 +208,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  
  	for_each_online_cpu(cpu) {
  		struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu);
-@@ -3165,99 +3108,219 @@ static int mvneta_set_mac_addr(struct ne
+@@ -3166,99 +3109,219 @@ static int mvneta_set_mac_addr(struct ne
  	return 0;
  }
  
@@ -501,7 +501,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  /* Electing a CPU must be done in an atomic way: it should be done
-@@ -3505,10 +3568,7 @@ static int mvneta_ioctl(struct net_devic
+@@ -3506,10 +3569,7 @@ static int mvneta_ioctl(struct net_devic
  {
  	struct mvneta_port *pp = netdev_priv(dev);
  
@@ -513,7 +513,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  /* Ethtool methods */
-@@ -3518,54 +3578,15 @@ int mvneta_ethtool_get_settings(struct n
+@@ -3519,54 +3579,15 @@ int mvneta_ethtool_get_settings(struct n
  {
  	struct mvneta_port *pp = netdev_priv(dev);
  
@@ -570,7 +570,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  /* Set interrupt coalescing for ethtools */
-@@ -3673,7 +3694,8 @@ static void mvneta_ethtool_update_stats(
+@@ -3674,7 +3695,8 @@ static void mvneta_ethtool_update_stats(
  {
  	const struct mvneta_statistic *s;
  	void __iomem *base = pp->base;
@@ -580,7 +580,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	u64 val64;
  	int i;
  
-@@ -3968,14 +3990,13 @@ static int mvneta_probe(struct platform_
+@@ -3969,14 +3991,13 @@ static int mvneta_probe(struct platform_
  	const struct mbus_dram_target_info *dram_target_info;
  	struct resource *res;
  	struct device_node *dn = pdev->dev.of_node;
@@ -596,7 +596,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	int tx_csum_limit;
  	int phy_mode;
  	int err;
-@@ -3991,31 +4012,11 @@ static int mvneta_probe(struct platform_
+@@ -3992,31 +4013,11 @@ static int mvneta_probe(struct platform_
  		goto err_free_netdev;
  	}
  
@@ -629,7 +629,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	}
  
  	dev->tx_queue_len = MVNETA_MAX_TXD;
-@@ -4026,12 +4027,7 @@ static int mvneta_probe(struct platform_
+@@ -4027,12 +4028,7 @@ static int mvneta_probe(struct platform_
  
  	pp = netdev_priv(dev);
  	spin_lock_init(&pp->lock);
@@ -643,7 +643,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	pp->cpu_notifier.notifier_call = mvneta_percpu_notifier;
  
  	pp->rxq_def = rxq_def;
-@@ -4041,7 +4037,7 @@ static int mvneta_probe(struct platform_
+@@ -4042,7 +4038,7 @@ static int mvneta_probe(struct platform_
  	pp->clk = devm_clk_get(&pdev->dev, NULL);
  	if (IS_ERR(pp->clk)) {
  		err = PTR_ERR(pp->clk);
@@ -652,7 +652,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	}
  
  	clk_prepare_enable(pp->clk);
-@@ -4144,6 +4140,14 @@ static int mvneta_probe(struct platform_
+@@ -4145,6 +4141,14 @@ static int mvneta_probe(struct platform_
  	dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE;
  	dev->gso_max_segs = MVNETA_MAX_TSO_SEGS;
  
@@ -667,7 +667,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	err = register_netdev(dev);
  	if (err < 0) {
  		dev_err(&pdev->dev, "failed to register\n");
-@@ -4155,13 +4159,6 @@ static int mvneta_probe(struct platform_
+@@ -4156,13 +4160,6 @@ static int mvneta_probe(struct platform_
  
  	platform_set_drvdata(pdev, pp->dev);
  
@@ -681,7 +681,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  
  	return 0;
  
-@@ -4173,13 +4170,13 @@ err_netdev:
+@@ -4174,13 +4171,13 @@ err_netdev:
  				       1 << pp->id);
  	}
  err_free_stats:
@@ -697,7 +697,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  err_free_irq:
  	irq_dispose_mapping(dev->irq);
  err_free_netdev:
-@@ -4198,7 +4195,7 @@ static int mvneta_remove(struct platform
+@@ -4199,7 +4196,7 @@ static int mvneta_remove(struct platform
  	free_percpu(pp->ports);
  	free_percpu(pp->stats);
  	irq_dispose_mapping(dev->irq);
diff --git a/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch b/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch
index 034b596436..700b9b5361 100644
--- a/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch
+++ b/target/linux/mvebu/patches-4.4/137-net-mvneta-add-nway_reset-support.patch
@@ -14,7 +14,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3589,6 +3589,13 @@ int mvneta_ethtool_set_settings(struct n
+@@ -3590,6 +3590,13 @@ int mvneta_ethtool_set_settings(struct n
  	return phylink_ethtool_set_settings(pp->phylink, cmd);
  }
  
@@ -28,7 +28,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  /* Set interrupt coalescing for ethtools */
  static int mvneta_ethtool_set_coalesce(struct net_device *dev,
  				       struct ethtool_coalesce *c)
-@@ -3853,6 +3860,7 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -3854,6 +3861,7 @@ const struct ethtool_ops mvneta_eth_tool
  	.get_link       = ethtool_op_get_link,
  	.get_settings   = mvneta_ethtool_get_settings,
  	.set_settings   = mvneta_ethtool_set_settings,
diff --git a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch
index 75cd46e3da..62633cff46 100644
--- a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch
+++ b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch
@@ -14,7 +14,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3208,6 +3208,8 @@ static void mvneta_mac_config(struct net
+@@ -3209,6 +3209,8 @@ static void mvneta_mac_config(struct net
  
  	if (state->advertising & ADVERTISED_Pause)
  		new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL;
@@ -23,7 +23,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  
  	switch (mode) {
  	case MLO_AN_SGMII:
-@@ -3232,7 +3234,7 @@ static void mvneta_mac_config(struct net
+@@ -3233,7 +3235,7 @@ static void mvneta_mac_config(struct net
  			 /* The MAC only supports FD mode */
  			 MVNETA_GMAC_CONFIG_FULL_DUPLEX;
  
@@ -32,7 +32,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  			new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN;
  		break;
  
-@@ -3685,6 +3687,22 @@ static int mvneta_ethtool_set_ringparam(
+@@ -3686,6 +3688,22 @@ static int mvneta_ethtool_set_ringparam(
  	return 0;
  }
  
@@ -55,7 +55,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset,
  				       u8 *data)
  {
-@@ -3866,6 +3884,8 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -3867,6 +3885,8 @@ const struct ethtool_ops mvneta_eth_tool
  	.get_drvinfo    = mvneta_ethtool_get_drvinfo,
  	.get_ringparam  = mvneta_ethtool_get_ringparam,
  	.set_ringparam	= mvneta_ethtool_set_ringparam,
diff --git a/target/linux/mvebu/patches-4.4/140-net-mvneta-enable-flow-control-for-PHY-connections.patch b/target/linux/mvebu/patches-4.4/140-net-mvneta-enable-flow-control-for-PHY-connections.patch
index e10574c753..1c081757bd 100644
--- a/target/linux/mvebu/patches-4.4/140-net-mvneta-enable-flow-control-for-PHY-connections.patch
+++ b/target/linux/mvebu/patches-4.4/140-net-mvneta-enable-flow-control-for-PHY-connections.patch
@@ -15,7 +15,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3127,12 +3127,14 @@ static int mvneta_mac_support(struct net
+@@ -3128,12 +3128,14 @@ static int mvneta_mac_support(struct net
  		state->supported = PHY_10BT_FEATURES |
  				   PHY_100BT_FEATURES |
  				   SUPPORTED_1000baseT_Full |
diff --git a/target/linux/mvebu/patches-4.4/141-net-mvneta-enable-flow-control-for-fixed-connections.patch b/target/linux/mvebu/patches-4.4/141-net-mvneta-enable-flow-control-for-fixed-connections.patch
index 16ffab3d46..d1683d98a2 100644
--- a/target/linux/mvebu/patches-4.4/141-net-mvneta-enable-flow-control-for-fixed-connections.patch
+++ b/target/linux/mvebu/patches-4.4/141-net-mvneta-enable-flow-control-for-fixed-connections.patch
@@ -15,7 +15,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3114,9 +3114,9 @@ static int mvneta_mac_support(struct net
+@@ -3115,9 +3115,9 @@ static int mvneta_mac_support(struct net
  	switch (mode) {
  	case MLO_AN_8023Z:
  		state->supported = SUPPORTED_1000baseT_Full |
@@ -27,7 +27,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  		state->an_enabled = 1;
  		break;
  
-@@ -3127,18 +3127,21 @@ static int mvneta_mac_support(struct net
+@@ -3128,18 +3128,21 @@ static int mvneta_mac_support(struct net
  		state->supported = PHY_10BT_FEATURES |
  				   PHY_100BT_FEATURES |
  				   SUPPORTED_1000baseT_Full |
diff --git a/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch b/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch
index b9043561d0..71f8c166e9 100644
--- a/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch
+++ b/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch
@@ -68,7 +68,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  	u64 ethtool_stats[ARRAY_SIZE(mvneta_statistics)];
  
  	u32 indir[MVNETA_RSS_LU_TABLE_SIZE];
-@@ -3276,6 +3293,18 @@ static void mvneta_mac_config(struct net
+@@ -3277,6 +3294,18 @@ static void mvneta_mac_config(struct net
  		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, new_an);
  }
  
@@ -87,7 +87,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  static void mvneta_mac_link_down(struct net_device *ndev, unsigned int mode)
  {
  	struct mvneta_port *pp = netdev_priv(ndev);
-@@ -3289,6 +3318,9 @@ static void mvneta_mac_link_down(struct
+@@ -3290,6 +3319,9 @@ static void mvneta_mac_link_down(struct
  		val |= MVNETA_GMAC_FORCE_LINK_DOWN;
  		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
  	}
@@ -97,7 +97,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  static void mvneta_mac_link_up(struct net_device *ndev, unsigned int mode,
-@@ -3305,6 +3337,11 @@ static void mvneta_mac_link_up(struct ne
+@@ -3306,6 +3338,11 @@ static void mvneta_mac_link_up(struct ne
  	}
  
  	mvneta_port_up(pp);
@@ -109,7 +109,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  static const struct phylink_mac_ops mvneta_phylink_ops = {
-@@ -3744,6 +3781,13 @@ static void mvneta_ethtool_update_stats(
+@@ -3745,6 +3782,13 @@ static void mvneta_ethtool_update_stats(
  			val64 = (u64)high << 32 | low;
  			pp->ethtool_stats[i] += val64;
  			break;
@@ -123,7 +123,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  		}
  	}
  }
-@@ -3867,6 +3911,47 @@ static int mvneta_ethtool_get_rxfh(struc
+@@ -3868,6 +3912,47 @@ static int mvneta_ethtool_get_rxfh(struc
  	return 0;
  }
  
@@ -171,7 +171,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  static const struct net_device_ops mvneta_netdev_ops = {
  	.ndo_open            = mvneta_open,
  	.ndo_stop            = mvneta_stop,
-@@ -3898,6 +3983,8 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -3899,6 +3984,8 @@ const struct ethtool_ops mvneta_eth_tool
  	.get_rxnfc	= mvneta_ethtool_get_rxnfc,
  	.get_rxfh	= mvneta_ethtool_get_rxfh,
  	.set_rxfh	= mvneta_ethtool_set_rxfh,
diff --git a/target/linux/mvebu/patches-4.4/145-net-mvneta-add-module-EEPROM-reading-support.patch b/target/linux/mvebu/patches-4.4/145-net-mvneta-add-module-EEPROM-reading-support.patch
index b3f9039081..7100e4da56 100644
--- a/target/linux/mvebu/patches-4.4/145-net-mvneta-add-module-EEPROM-reading-support.patch
+++ b/target/linux/mvebu/patches-4.4/145-net-mvneta-add-module-EEPROM-reading-support.patch
@@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3911,6 +3911,22 @@ static int mvneta_ethtool_get_rxfh(struc
+@@ -3912,6 +3912,22 @@ static int mvneta_ethtool_get_rxfh(struc
  	return 0;
  }
  
@@ -33,7 +33,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  static int mvneta_ethtool_get_eee(struct net_device *dev,
  				  struct ethtool_eee *eee)
  {
-@@ -3983,6 +3999,8 @@ const struct ethtool_ops mvneta_eth_tool
+@@ -3984,6 +4000,8 @@ const struct ethtool_ops mvneta_eth_tool
  	.get_rxnfc	= mvneta_ethtool_get_rxnfc,
  	.get_rxfh	= mvneta_ethtool_get_rxfh,
  	.set_rxfh	= mvneta_ethtool_set_rxfh,
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);
  
diff --git a/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch
index 5dba311d93..d2ea24ba40 100644
--- a/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-4.4/400-mvneta-tx-queue-workaround.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3984,6 +3984,16 @@ static int mvneta_ethtool_set_eee(struct
+@@ -3985,6 +3985,16 @@ static int mvneta_ethtool_set_eee(struct
  	return phylink_ethtool_set_eee(pp->phylink, eee);
  }
  
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static const struct net_device_ops mvneta_netdev_ops = {
  	.ndo_open            = mvneta_open,
  	.ndo_stop            = mvneta_stop,
-@@ -3994,6 +4004,7 @@ static const struct net_device_ops mvnet
+@@ -3995,6 +4005,7 @@ static const struct net_device_ops mvnet
  	.ndo_fix_features    = mvneta_fix_features,
  	.ndo_get_stats64     = mvneta_get_stats64,
  	.ndo_do_ioctl        = mvneta_ioctl,