aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-06-15 14:21:04 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-15 14:26:41 +0200
commit287303b0628b7b448cb7705b087ece7fbc5b97c3 (patch)
tree8e74973039d5d30f61f1b25f9b3202ec0900f361 /target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
parent920f2d92375de88151d8f836bdc778be85c7b552 (diff)
downloadupstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.gz
upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.bz2
upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.zip
kernel: bump 5.10 to 5.10.184
Manually rebased: generic/pending-5.10/851-0004-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch All other patches automatically rebased. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
-rw-r--r--target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 3311c832ea..99eff273bd 100644
--- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -2059,6 +2059,8 @@ struct net_device {
+@@ -2062,6 +2062,8 @@ struct net_device {
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;
@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -6071,6 +6071,9 @@ static enum gro_result dev_gro_receive(s
+@@ -6073,6 +6073,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev))
goto normal;
-@@ -8049,6 +8052,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -8051,6 +8054,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
-@@ -8100,6 +8145,7 @@ static int __netdev_upper_dev_link(struc
+@@ -8102,6 +8147,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
-@@ -8196,6 +8242,7 @@ static void __netdev_upper_dev_unlink(st
+@@ -8198,6 +8244,7 @@ static void __netdev_upper_dev_unlink(st
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
-@@ -8982,6 +9029,7 @@ int dev_set_mac_address(struct net_devic
+@@ -8984,6 +9031,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;