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/ipq40xx/patches-5.10/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.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/ipq40xx/patches-5.10/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch')
-rw-r--r-- | target/linux/ipq40xx/patches-5.10/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ipq40xx/patches-5.10/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch b/target/linux/ipq40xx/patches-5.10/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch index 8be894dbfe..3c0f53bab1 100644 --- a/target/linux/ipq40xx/patches-5.10/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch +++ b/target/linux/ipq40xx/patches-5.10/703-net-IPQ4019-needs-rfs-vlan_tag-callbacks-in.patch @@ -24,7 +24,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -788,6 +788,16 @@ struct xps_map { +@@ -791,6 +791,16 @@ struct xps_map { #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \ - sizeof(struct xps_map)) / sizeof(u16)) @@ -41,7 +41,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org> /* * This structure holds all XPS maps for device. Maps are indexed by CPU. */ -@@ -1475,6 +1485,9 @@ struct net_device_ops { +@@ -1478,6 +1488,9 @@ struct net_device_ops { const struct sk_buff *skb, u16 rxq_index, u32 flow_id); |