X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fdedeckeh.git;a=blobdiff_plain;f=target%2Flinux%2Flayerscape%2Fpatches-4.14%2F202-core-linux-support-layerscape.patch;h=05dafbb69f8c52050868556b7253c67b6c2ca5f9;hp=90bb6426e49a6b7bc68fa5e12734325823cd9400;hb=0304e76cd1124dd4ff70ad1a540b5719cc991b43;hpb=89bf16ad503d73e4444a2a766526ba645f76134b

diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
index 90bb6426e4..05dafbb69f 100644
--- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
@@ -74,7 +74,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  	} else if (has_acpi_companion(dma_dev)) {
 --- a/drivers/net/bonding/bond_main.c
 +++ b/drivers/net/bonding/bond_main.c
-@@ -1337,7 +1337,8 @@ void bond_lower_state_changed(struct sla
+@@ -1330,7 +1330,8 @@ void bond_lower_state_changed(struct sla
  }
  
  /* enslave device <slave> to bond device <master> */
@@ -84,7 +84,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  {
  	struct bonding *bond = netdev_priv(bond_dev);
  	const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
-@@ -3509,7 +3510,7 @@ static int bond_do_ioctl(struct net_devi
+@@ -3502,7 +3503,7 @@ static int bond_do_ioctl(struct net_devi
  	switch (cmd) {
  	case BOND_ENSLAVE_OLD:
  	case SIOCBONDENSLAVE:
@@ -106,7 +106,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  	case '-':
 --- a/drivers/net/team/team.c
 +++ b/drivers/net/team/team.c
-@@ -1932,7 +1932,8 @@ static int team_netpoll_setup(struct net
+@@ -1921,7 +1921,8 @@ static int team_netpoll_setup(struct net
  }
  #endif
  
@@ -263,7 +263,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  int bond_set_carrier(struct bonding *bond);
 --- a/net/batman-adv/soft-interface.c
 +++ b/net/batman-adv/soft-interface.c
-@@ -872,7 +872,8 @@ free_bat_counters:
+@@ -876,7 +876,8 @@ free_bat_counters:
   * Return: 0 if successful or error otherwise.
   */
  static int batadv_softif_slave_add(struct net_device *dev,
@@ -522,7 +522,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  		}
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -799,6 +799,32 @@ void napi_consume_skb(struct sk_buff *sk
+@@ -803,6 +803,32 @@ void napi_consume_skb(struct sk_buff *sk
  }
  EXPORT_SYMBOL(napi_consume_skb);
  
@@ -555,7 +555,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  /* Make sure a field is enclosed inside headers_start/headers_end section */
  #define CHECK_SKB_FIELD(field) \
  	BUILD_BUG_ON(offsetof(struct sk_buff, field) <		\
-@@ -1318,7 +1344,7 @@ static void skb_headers_offset_update(st
+@@ -1322,7 +1348,7 @@ static void skb_headers_offset_update(st
  	skb->inner_mac_header += off;
  }
  
@@ -564,7 +564,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  {
  	__copy_skb_header(new, old);
  
-@@ -1326,6 +1352,7 @@ static void copy_skb_header(struct sk_bu
+@@ -1330,6 +1356,7 @@ static void copy_skb_header(struct sk_bu
  	skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
  	skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;
  }