kernel: bump 4.14 to 4.14.107

[openwrt/staging/dedeckeh.git] / target / linux / layerscape / patches-4.14 / 202-core-linux-support-layerscape.patch

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 1ca21db90c91d7bc8d528a6b796986d28983b32f..05dafbb69f8c52050868556b7253c67b6c2ca5f9 100644 (file)
--- 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
        } 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> */
  }
  
  /* 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;
  {
        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:
        switch (cmd) {
        case BOND_ENSLAVE_OLD:
        case SIOCBONDENSLAVE: