kernel: bump 5.15 to 5.15.32

[openwrt/staging/chunkeey.git] / target / linux / generic / pending-5.15 / 701-10-net-ethernet-mtk_eth_soc-support-creating-mac-addres.patch

diff --git a/target/linux/generic/pending-5.15/701-10-net-ethernet-mtk_eth_soc-support-creating-mac-addres.patch b/target/linux/generic/pending-5.15/701-10-net-ethernet-mtk_eth_soc-support-creating-mac-addres.patch
index 67c02d6dbc9251eb314b76e48a8903c14562fb71..209c65e66aa039d04df6de8639549f27846e8027 100644 (file)
--- a/target/linux/generic/pending-5.15/701-10-net-ethernet-mtk_eth_soc-support-creating-mac-addres.patch
+++ b/target/linux/generic/pending-5.15/701-10-net-ethernet-mtk_eth_soc-support-creating-mac-addres.patch
@@ -452,7 +452,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        struct {
                u16 id;
                __be16 proto;
-@@ -260,9 +262,45 @@ mtk_flow_offload_replace(struct mtk_eth
+@@ -257,9 +259,45 @@ mtk_flow_offload_replace(struct mtk_eth
                return -EOPNOTSUPP;
        }
  
@@ -498,7 +498,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                        if (act->mangle.htype == FLOW_ACT_MANGLE_HDR_TYPE_ETH)
                                mtk_flow_offload_mangle_eth(act, &data.eth);
                        break;
-@@ -294,17 +332,6 @@ mtk_flow_offload_replace(struct mtk_eth
+@@ -291,17 +329,6 @@ mtk_flow_offload_replace(struct mtk_eth
                }
        }
  
@@ -516,7 +516,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!is_valid_ether_addr(data.eth.h_source) ||
            !is_valid_ether_addr(data.eth.h_dest))
                return -EINVAL;
-@@ -318,10 +345,13 @@ mtk_flow_offload_replace(struct mtk_eth
+@@ -315,10 +342,13 @@ mtk_flow_offload_replace(struct mtk_eth
        if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) {
                struct flow_match_ports ports;
  
@@ -531,7 +531,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                return -EOPNOTSUPP;
        }
  
-@@ -351,6 +381,9 @@ mtk_flow_offload_replace(struct mtk_eth
+@@ -348,6 +378,9 @@ mtk_flow_offload_replace(struct mtk_eth
                if (act->id != FLOW_ACTION_MANGLE)
                        continue;
  
@@ -541,7 +541,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                switch (act->mangle.htype) {
                case FLOW_ACT_MANGLE_HDR_TYPE_TCP:
                case FLOW_ACT_MANGLE_HDR_TYPE_UDP:
-@@ -376,6 +409,9 @@ mtk_flow_offload_replace(struct mtk_eth
+@@ -373,6 +406,9 @@ mtk_flow_offload_replace(struct mtk_eth
                        return err;
        }