Skip to content

Commit

Permalink
kernel: move mtk flow offload patches to backport-5.15
Browse files Browse the repository at this point in the history
They were accepted upstream

Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
nbd168 committed Jun 18, 2022
1 parent 2d33216 commit 0e0058a
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 6 deletions.
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2068,6 +2068,8 @@ struct net_device {
@@ -2075,6 +2075,8 @@ struct net_device {
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;

Expand All @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u8 inner_protocol_type:1;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6051,6 +6051,9 @@ static enum gro_result dev_gro_receive(s
@@ -6055,6 +6055,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;

Expand All @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev))
goto normal;

@@ -8065,6 +8068,48 @@ static void __netdev_adjacent_dev_unlink
@@ -8069,6 +8072,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}

Expand Down Expand Up @@ -91,23 +91,23 @@ 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,
@@ -8116,6 +8161,7 @@ static int __netdev_upper_dev_link(struc
@@ -8120,6 +8165,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;

+ netdev_update_addr_mask(dev);
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -8212,6 +8258,7 @@ static void __netdev_upper_dev_unlink(st
@@ -8216,6 +8262,7 @@ static void __netdev_upper_dev_unlink(st

__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);

+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);

@@ -9031,6 +9078,7 @@ int dev_set_mac_address(struct net_devic
@@ -9035,6 +9082,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
Expand Down

0 comments on commit 0e0058a

Please sign in to comment.