diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-04-07 21:34:38 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-04-07 21:34:38 +0000 |
| commit | 0d7d44e1c14da6001a358d3c1777d82d42fb12f4 (patch) | |
| tree | f3753cac1e3fa34d450ce24b3029ec0db914a74c /target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | 046a1b56406df961c37fe3e6a30ee57060363aa1 (diff) | |
| download | upstream-0d7d44e1c14da6001a358d3c1777d82d42fb12f4.tar.gz upstream-0d7d44e1c14da6001a358d3c1777d82d42fb12f4.tar.bz2 upstream-0d7d44e1c14da6001a358d3c1777d82d42fb12f4.zip | |
generic/4.0: upgrade to 4.0-rc7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45305 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 48d73d1301..f0d5b4715e 100644 --- a/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/patches-4.0/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 -@@ -4005,6 +4005,9 @@ static enum gro_result dev_gro_receive(s +@@ -4007,6 +4007,9 @@ static enum gro_result dev_gro_receive(s 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; -@@ -5152,6 +5155,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5154,6 +5157,48 @@ static void __netdev_adjacent_dev_unlink &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) -@@ -5212,6 +5257,7 @@ static int __netdev_upper_dev_link(struc +@@ -5214,6 +5259,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); return 0; -@@ -5329,6 +5375,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5331,6 +5377,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); @@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); } EXPORT_SYMBOL(netdev_upper_dev_unlink); -@@ -5868,6 +5915,7 @@ int dev_set_mac_address(struct net_devic +@@ -5870,6 +5917,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |