kernel: bump 5.4 to 5.4.124

[openwrt/staging/ldir.git] / target / linux / generic / backport-5.4 / 752-v5.8-net-dsa-provide-an-option-for-drivers-to-always-rece.patch

diff --git a/target/linux/generic/backport-5.4/752-v5.8-net-dsa-provide-an-option-for-drivers-to-always-rece.patch b/target/linux/generic/backport-5.4/752-v5.8-net-dsa-provide-an-option-for-drivers-to-always-rece.patch
index 921821a899cd965ca7f6775fba3195bd14004bb7..52d9351b704c86bde1abfe71d1cff3c302738722 100644 (file)
--- a/target/linux/generic/backport-5.4/752-v5.8-net-dsa-provide-an-option-for-drivers-to-always-rece.patch
+++ b/target/linux/generic/backport-5.4/752-v5.8-net-dsa-provide-an-option-for-drivers-to-always-rece.patch
@@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                return 0;
  
        /* Do not deprogram the CPU port as it may be shared with other user
-@@ -1118,7 +1118,7 @@ static int dsa_slave_vlan_rx_add_vid(str
+@@ -1120,7 +1120,7 @@ static int dsa_slave_vlan_rx_add_vid(str
         * need to emulate the switchdev prepare + commit phase.
         */
        if (dp->bridge_dev) {
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        return 0;
  
                /* br_vlan_get_info() returns -EINVAL or -ENOENT if the
-@@ -1152,7 +1152,7 @@ static int dsa_slave_vlan_rx_kill_vid(st
+@@ -1154,7 +1154,7 @@ static int dsa_slave_vlan_rx_kill_vid(st
         * need to emulate the switchdev prepare + commit phase.
         */
        if (dp->bridge_dev) {