diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2022-03-21 15:22:20 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 05:00:50 +0100 |
| commit | 009f8afe06258adff30d83e936d097e42d5501ca (patch) | |
| tree | 8d8059364dd135646aae277ace45e77674c19865 /target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | 49cb5e501a8d6eb8ff5cad63f13282de7b84e7ef (diff) | |
| download | upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.gz upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.bz2 upstream-009f8afe06258adff30d83e936d097e42d5501ca.zip | |
generic: 5.15: refresh pending patch
Use 'make target/linux/refresh' to refresh pending patches.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
| -rw-r--r-- | target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index e64e0421e1..af57b4c5bb 100644 --- a/target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2036,6 +2036,8 @@ struct net_device { +@@ -2068,6 +2068,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -22,17 +22,17 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -858,6 +858,7 @@ struct sk_buff { - #ifdef CONFIG_TLS_DEVICE - __u8 decrypted:1; +@@ -855,6 +855,7 @@ struct sk_buff { + #ifdef CONFIG_IPV6_NDISC_NODETYPE + __u8 ndisc_nodetype:2; #endif + __u8 gro_skip:1; - #ifdef CONFIG_NET_SCHED - __u16 tc_index; /* traffic control index */ + __u8 ipvs_property:1; + __u8 inner_protocol_type:1; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -6062,6 +6062,9 @@ static enum gro_result dev_gro_receive(s +@@ -6051,6 +6051,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -8039,6 +8042,48 @@ static void __netdev_adjacent_dev_unlink +@@ -8065,6 +8068,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,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 *upper_priv, void *upper_info, -@@ -8090,6 +8135,7 @@ static int __netdev_upper_dev_link(struc +@@ -8116,6 +8161,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -8186,6 +8232,7 @@ static void __netdev_upper_dev_unlink(st +@@ -8212,6 +8258,7 @@ static void __netdev_upper_dev_unlink(st __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8972,6 +9019,7 @@ int dev_set_mac_address(struct net_devic +@@ -9031,6 +9078,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return 0; --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c -@@ -143,6 +143,18 @@ u32 eth_get_headlen(const struct net_dev +@@ -142,6 +142,18 @@ u32 eth_get_headlen(const struct net_dev } EXPORT_SYMBOL(eth_get_headlen); @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * eth_type_trans - determine the packet's protocol ID. * @skb: received socket data -@@ -174,6 +186,10 @@ __be16 eth_type_trans(struct sk_buff *sk +@@ -173,6 +185,10 @@ __be16 eth_type_trans(struct sk_buff *sk } else { skb->pkt_type = PACKET_OTHERHOST; } |