| /branches/18.06.1/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch |
|---|
| @@ -11,7 +11,7 @@ |
|---|
| |
| --- a/include/linux/netdevice.h |
| +++ b/include/linux/netdevice.h |
| @@ -1766,6 +1766,8 @@ struct net_device { |
| @@ -1763,6 +1763,8 @@ struct net_device { |
| struct netdev_hw_addr_list mc; |
| struct netdev_hw_addr_list dev_addrs; |
| |
| @@ -22,7 +22,7 @@ |
|---|
| #endif |
| --- a/include/linux/skbuff.h |
| +++ b/include/linux/skbuff.h |
| @@ -782,6 +782,7 @@ struct sk_buff { |
| @@ -777,6 +777,7 @@ struct sk_buff { |
| __u8 tc_redirected:1; |
| __u8 tc_from_ingress:1; |
| #endif |
| @@ -32,7 +32,7 @@ |
|---|
| __u16 tc_index; /* traffic control index */ |
| --- a/net/core/dev.c |
| +++ b/net/core/dev.c |
| @@ -4805,6 +4805,9 @@ static enum gro_result dev_gro_receive(s |
| @@ -4783,6 +4783,9 @@ static enum gro_result dev_gro_receive(s |
| enum gro_result ret; |
| int grow; |
| |
| @@ -42,7 +42,7 @@ |
|---|
| if (netif_elide_gro(skb->dev)) |
| goto normal; |
| |
| @@ -6279,6 +6282,48 @@ static void __netdev_adjacent_dev_unlink |
| @@ -6253,6 +6256,48 @@ static void __netdev_adjacent_dev_unlink |
| &upper_dev->adj_list.lower); |
| } |
| |
| @@ -91,7 +91,7 @@ |
|---|
| static int __netdev_upper_dev_link(struct net_device *dev, |
| struct net_device *upper_dev, bool master, |
| void *upper_priv, void *upper_info) |
| @@ -6317,6 +6362,7 @@ static int __netdev_upper_dev_link(struc |
| @@ -6291,6 +6336,7 @@ static int __netdev_upper_dev_link(struc |
| if (ret) |
| return ret; |
| |
| @@ -99,7 +99,7 @@ |
|---|
| ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, |
| &changeupper_info.info); |
| ret = notifier_to_errno(ret); |
| @@ -6394,6 +6440,7 @@ void netdev_upper_dev_unlink(struct net_ |
| @@ -6368,6 +6414,7 @@ void netdev_upper_dev_unlink(struct net_ |
| |
| __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); |
| |
| @@ -107,7 +107,7 @@ |
|---|
| call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, |
| &changeupper_info.info); |
| } |
| @@ -6966,6 +7013,7 @@ int dev_set_mac_address(struct net_devic |
| @@ -6938,6 +6985,7 @@ int dev_set_mac_address(struct net_devic |
| if (err) |
| return err; |
| dev->addr_assign_type = NET_ADDR_SET; |
