diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-15 14:21:04 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-15 14:26:41 +0200 |
| commit | 287303b0628b7b448cb7705b087ece7fbc5b97c3 (patch) | |
| tree | 8e74973039d5d30f61f1b25f9b3202ec0900f361 /target/linux/generic/pending-5.10/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch | |
| parent | 920f2d92375de88151d8f836bdc778be85c7b552 (diff) | |
| download | upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.gz upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.bz2 upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.zip | |
kernel: bump 5.10 to 5.10.184
Manually rebased:
generic/pending-5.10/851-0004-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch
All other patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.10/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch b/target/linux/generic/pending-5.10/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch index b9c6d4378a..9ba835aee7 100644 --- a/target/linux/generic/pending-5.10/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch +++ b/target/linux/generic/pending-5.10/701-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch @@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static inline void --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -856,6 +856,7 @@ enum net_device_path_type { +@@ -859,6 +859,7 @@ enum net_device_path_type { DEV_PATH_BRIDGE, DEV_PATH_PPPOE, DEV_PATH_DSA, @@ -241,7 +241,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> }; struct net_device_path { -@@ -881,6 +882,12 @@ struct net_device_path { +@@ -884,6 +885,12 @@ struct net_device_path { int port; u16 proto; } dsa; |