projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 4.4 to 4.4.74
[openwrt/staging/dedeckeh.git]
/
target
/
linux
/
generic
/
patches-4.4
/
680-NET-skip-GRO-for-foreign-MAC-addresses.patch
diff --git
a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 698d394b8c94dfb906c23462c6b94e316c44f6a1..4ef11ed17ebd7e3b7495b0a69435102de1efbcb6 100644
(file)
--- a/
target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/
target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@
-17,7
+17,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -42
22,6 +4222
,9 @@ static enum gro_result dev_gro_receive(s
+@@ -42
48,6 +4248
,9 @@ static enum gro_result dev_gro_receive(s
enum gro_result ret;
int grow;
enum gro_result ret;
int grow;
@@
-27,7
+27,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
-@@ -5
381,6 +5384
,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5
404,6 +5407
,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
&upper_dev->adj_list.lower);
}
@@
-76,7
+76,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 *private)
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *private)
-@@ -54
52,6 +5497
,7 @@ static int __netdev_upper_dev_link(struc
+@@ -54
75,6 +5520
,7 @@ static int __netdev_upper_dev_link(struc
goto rollback_lower_mesh;
}
goto rollback_lower_mesh;
}
@@
-84,7
+84,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
return 0;
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
return 0;
-@@ -5
578,6 +5624
,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -5
601,6 +5647
,7 @@ void netdev_upper_dev_unlink(struct net_
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
@@
-92,7
+92,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
}
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
}
-@@ -61
18,6 +6165
,7 @@ int dev_set_mac_address(struct net_devic
+@@ -61
41,6 +6188
,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
@@
-102,7
+102,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0;
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
return 0;
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -163
7,6 +1637
,8 @@ struct net_device {
+@@ -163
9,6 +1639
,8 @@ struct net_device {
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;