diff options
Diffstat (limited to 'target/linux/generic/backport-5.10')
3 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-12-net-8021q-resolve-forwarding-path-for-vlan-devices.patch b/target/linux/generic/backport-5.10/610-v5.13-12-net-8021q-resolve-forwarding-path-for-vlan-devices.patch index 16eb940ad1..32c8c9bb78 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-12-net-8021q-resolve-forwarding-path-for-vlan-devices.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-12-net-8021q-resolve-forwarding-path-for-vlan-devices.patch @@ -49,7 +49,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> #define NET_DEVICE_PATH_STACK_MAX 5 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c -@@ -767,6 +767,20 @@ static int vlan_dev_get_iflink(const str +@@ -770,6 +770,20 @@ static int vlan_dev_get_iflink(const str return real_dev->ifindex; } @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static const struct ethtool_ops vlan_ethtool_ops = { .get_link_ksettings = vlan_ethtool_get_link_ksettings, .get_drvinfo = vlan_ethtool_get_drvinfo, -@@ -805,6 +819,7 @@ static const struct net_device_ops vlan_ +@@ -808,6 +822,7 @@ static const struct net_device_ops vlan_ #endif .ndo_fix_features = vlan_dev_fix_features, .ndo_get_iflink = vlan_dev_get_iflink, diff --git a/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch b/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch index 9abc6e6778..ba2b1a2877 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch @@ -51,7 +51,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> enum tc_setup_type { --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c -@@ -777,6 +777,12 @@ static int vlan_dev_fill_forward_path(st +@@ -780,6 +780,12 @@ static int vlan_dev_fill_forward_path(st path->encap.proto = vlan->vlan_proto; path->dev = ctx->dev; ctx->dev = vlan->real_dev; diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index e7e9d19a2f..196ff1dcba 100644 --- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -933,7 +933,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } --- a/drivers/net/ethernet/microchip/lan743x_main.c +++ b/drivers/net/ethernet/microchip/lan743x_main.c -@@ -2837,7 +2837,6 @@ static int lan743x_pcidev_probe(struct p +@@ -2831,7 +2831,6 @@ static int lan743x_pcidev_probe(struct p { struct lan743x_adapter *adapter = NULL; struct net_device *netdev = NULL; @@ -941,7 +941,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int ret = -ENODEV; netdev = devm_alloc_etherdev(&pdev->dev, -@@ -2854,9 +2853,7 @@ static int lan743x_pcidev_probe(struct p +@@ -2848,9 +2847,7 @@ static int lan743x_pcidev_probe(struct p NETIF_MSG_IFDOWN | NETIF_MSG_TX_QUEUED; netdev->max_mtu = LAN743X_MAX_FRAME_SIZE; @@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int irq; --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -4957,7 +4957,7 @@ int stmmac_dvr_probe(struct device *devi +@@ -4990,7 +4990,7 @@ int stmmac_dvr_probe(struct device *devi priv->wol_irq = res->wol_irq; priv->lpi_irq = res->lpi_irq; @@ -1371,7 +1371,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> dev_set_drvdata(device, priv->dev); --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -@@ -394,7 +394,7 @@ static int stmmac_of_get_mac_mode(struct +@@ -395,7 +395,7 @@ static int stmmac_of_get_mac_mode(struct * set some private fields that will be used by the main at runtime. */ struct plat_stmmacenet_data * @@ -1380,7 +1380,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> { struct device_node *np = pdev->dev.of_node; struct plat_stmmacenet_data *plat; -@@ -406,12 +406,12 @@ stmmac_probe_config_dt(struct platform_d +@@ -407,12 +407,12 @@ stmmac_probe_config_dt(struct platform_d if (!plat) return ERR_PTR(-ENOMEM); @@ -1398,7 +1398,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } phy_mode = device_get_phy_mode(&pdev->dev); -@@ -643,7 +643,7 @@ void stmmac_remove_config_dt(struct plat +@@ -644,7 +644,7 @@ void stmmac_remove_config_dt(struct plat } #else struct plat_stmmacenet_data * |