From 268d380182ff34b9b049988c3a1947011e7c365b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 5 Mar 2016 17:51:37 +0000 Subject: kernel: update kernel 4.4 to version 4.4.4 Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48933 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '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 256bd514aa..a9ea04a43d 100644 --- 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 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4204,6 +4204,9 @@ static enum gro_result dev_gro_receive(s +@@ -4205,6 +4205,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5354,6 +5357,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5357,6 +5360,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *private) -@@ -5425,6 +5470,7 @@ static int __netdev_upper_dev_link(struc +@@ -5428,6 +5473,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); return 0; -@@ -5551,6 +5597,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5554,6 +5600,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 call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6091,6 +6138,7 @@ int dev_set_mac_address(struct net_devic +@@ -6094,6 +6141,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; @@ -113,7 +113,7 @@ Signed-off-by: Felix Fietkau #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -641,7 +641,8 @@ struct sk_buff { +@@ -642,7 +642,8 @@ struct sk_buff { __u8 ipvs_property:1; __u8 inner_protocol_type:1; __u8 remcsum_offload:1; -- cgit v1.2.3