projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #536 from wigyori/cc-sec
[15.05/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
680-NET-skip-GRO-for-foreign-MAC-addresses.patch
diff --git
a/target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
b/target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index
21199fe
..
6b02b3c
100644
(file)
--- a/
target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/
target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@
-17,7
+17,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -400
2,6 +4002
,9 @@ static enum gro_result dev_gro_receive(s
+@@ -400
6,6 +4006
,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@openwrt.org>
if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
-@@ -50
67,6 +507
0,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -50
77,6 +508
0,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@openwrt.org>
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)
-@@ -51
27,6 +517
2,7 @@ static int __netdev_upper_dev_link(struc
+@@ -51
37,6 +518
2,7 @@ static int __netdev_upper_dev_link(struc
goto rollback_lower_mesh;
}
goto rollback_lower_mesh;
}
@@
-84,15
+84,15
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev);
return 0;
call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev);
return 0;
-@@ -52
44,6 +529
0,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -52
54,6 +530
0,7 @@ void netdev_upper_dev_unlink(struct net_
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
- __netdev_adjacent_dev_unlink(dev, i->dev);
+ __netdev_adjacent_dev_unlink(dev, i->dev
, i->ref_nr
);
+ netdev_update_addr_mask(dev);
call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev);
}
EXPORT_SYMBOL(netdev_upper_dev_unlink);
+ netdev_update_addr_mask(dev);
call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev);
}
EXPORT_SYMBOL(netdev_upper_dev_unlink);
-@@ -57
63,6 +581
0,7 @@ int dev_set_mac_address(struct net_devic
+@@ -57
73,6 +582
0,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;
@@
-113,7
+113,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -59
7,7 +597
,8 @@ struct sk_buff {
+@@ -59
8,7 +598
,8 @@ struct sk_buff {
#endif
__u8 ipvs_property:1;
__u8 inner_protocol_type:1;
#endif
__u8 ipvs_property:1;
__u8 inner_protocol_type:1;