Skip to content

Commit d5e9d0b

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 5.15 to 5.15.80 (coolsnowwolf#10506) kernel: bump 6.0 to 6.0.10 (coolsnowwolf#10505)
2 parents f53c483 + 21bab22 commit d5e9d0b

File tree

31 files changed

+127
-105
lines changed

31 files changed

+127
-105
lines changed

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .79
2-
LINUX_KERNEL_HASH-5.15.79 = cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154
1+
LINUX_VERSION-5.15 = .80
2+
LINUX_KERNEL_HASH-5.15.80 = 3b321a6466d2021f60ed8d4e33bba21db2f23efc2ddd2d9fb775393d9afdfd4d

‎include/kernel-6.0

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.0 = .9
2-
LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7
1+
LINUX_VERSION-6.0 = .10
2+
LINUX_KERNEL_HASH-6.0.10 = 39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0

‎target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch

+51-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
From: Felix Fietkau <[email protected]>
2+
Subject: [PATCH] ar71xx: fix unaligned access in a few more places
3+
4+
SVN-Revision: 35130
5+
---
6+
arch/mips/include/asm/checksum.h | 83 +++---------------
7+
include/uapi/linux/ip.h | 2 +-
8+
include/uapi/linux/ipv6.h | 2 +-
9+
include/uapi/linux/tcp.h | 4 ++--
10+
include/uapi/linux/udp.h | 2 +-
11+
net/netfilter/nf_conntrack_core.c | 4 ++--
12+
include/uapi/linux/icmp.h | 2 +-
13+
include/uapi/linux/in6.h | 2 +-
14+
net/ipv6/tcp_ipv6.c | 9 +++--
15+
net/ipv6/datagram.c | 6 ++--
16+
net/ipv6/exthdrs.c | 2 +-
17+
include/linux/types.h | 5 +++
18+
net/ipv4/af_inet.c | 4 ++--
19+
net/ipv4/tcp_output.c | 69 +++++++++--------
20+
include/uapi/linux/igmp.h | 8 +++---
21+
net/core/flow_dissector.c | 2 +-
22+
include/uapi/linux/icmpv6.h | 2 +-
23+
include/net/ndisc.h | 10 ++++----
24+
net/sched/cls_u32.c | 6 +++---
25+
net/ipv6/ip6_offload.c | 2 +-
26+
include/net/addrconf.h | 2 +-
27+
include/net/inet_ecn.h | 4 ++--
28+
include/net/ipv6.h | 23 +++++----
29+
include/net/secure_seq.h | 1 +
30+
include/uapi/linux/in.h | 2 +-
31+
net/ipv6/ip6_fib.h | 2 +-
32+
net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
33+
net/xfrm/xfrm_input.c | 4 ++--
34+
net/ipv4/tcp_input.c | 12 ++++---
35+
include/uapi/linux/if_pppox.h | 1 +
36+
net/ipv6/netfilter/nf_log_ipv6.c | 4 ++--
37+
include/net/neighbour.h | 6 +++--
38+
include/uapi/linux/netfilter_arp/arp_tables.h | 2 +-
39+
net/core/utils.c | 10 +++++--
40+
include/linux/etherdevice.h | 11 ++++---
41+
net/ipv4/tcp_offload.c | 6 +++---
42+
net/ipv6/netfilter/ip6table_mangle.c | 4 ++--
43+
37 file changed, 171 insertions(+), 141 deletions(-)
44+
145
--- a/arch/mips/include/asm/checksum.h
246
+++ b/arch/mips/include/asm/checksum.h
347
@@ -100,26 +100,30 @@ static inline __sum16 ip_fast_csum(const
@@ -118,9 +162,9 @@
118162

119163
--- a/include/uapi/linux/ip.h
120164
+++ b/include/uapi/linux/ip.h
121-
@@ -103,7 +103,7 @@ struct iphdr {
122-
__be32 saddr;
123-
__be32 daddr;
165+
@@ -105,7 +105,7 @@ struct iphdr {
166+
__be32 daddr;
167+
);
124168
/*The options start here. */
125169
-};
126170
+} __attribute__((packed, aligned(2)));
@@ -129,10 +173,10 @@
129173
struct ip_auth_hdr {
130174
--- a/include/uapi/linux/ipv6.h
131175
+++ b/include/uapi/linux/ipv6.h
132-
@@ -132,7 +132,7 @@ struct ipv6hdr {
133-
134-
struct in6_addr saddr;
135-
struct in6_addr daddr;
176+
@@ -134,7 +134,7 @@ struct ipv6hdr {
177+
struct in6_addr saddr;
178+
struct in6_addr daddr;
179+
);
136180
-};
137181
+} __attribute__((packed, aligned(2)));
138182

‎target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ bcm2835-mmc: uninitialized_var is no more
291291
goto out;
292292
--- a/drivers/mmc/core/core.c
293293
+++ b/drivers/mmc/core/core.c
294-
@@ -1801,7 +1801,8 @@ EXPORT_SYMBOL(mmc_erase);
294+
@@ -1807,7 +1807,8 @@ EXPORT_SYMBOL(mmc_erase);
295295

296296
int mmc_can_erase(struct mmc_card *card)
297297
{

‎target/linux/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Signed-off-by: Joerg Quinten <[email protected]>
157157
static const struct drm_display_mode innolux_at070tn92_mode = {
158158
.clock = 33333,
159159
.hdisplay = 800,
160-
@@ -4660,6 +4692,9 @@ static const struct of_device_id platfor
160+
@@ -4662,6 +4694,9 @@ static const struct of_device_id platfor
161161
.compatible = "innolux,at043tn24",
162162
.data = &innolux_at043tn24,
163163
}, {

‎target/linux/bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
1515

1616
--- a/drivers/gpu/drm/panel/panel-simple.c
1717
+++ b/drivers/gpu/drm/panel/panel-simple.c
18-
@@ -3759,6 +3759,31 @@ static const struct panel_desc qishenglo
18+
@@ -3761,6 +3761,31 @@ static const struct panel_desc qishenglo
1919
.connector_type = DRM_MODE_CONNECTOR_DPI,
2020
};
2121

@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
4747
static const struct display_timing rocktech_rk070er9427_timing = {
4848
.pixelclock = { 26400000, 33300000, 46800000 },
4949
.hactive = { 800, 800, 800 },
50-
@@ -4839,6 +4864,9 @@ static const struct of_device_id platfor
50+
@@ -4841,6 +4866,9 @@ static const struct of_device_id platfor
5151
.compatible = "qishenglong,gopher2b-lcd",
5252
.data = &qishenglong_gopher2b_lcd,
5353
}, {

‎target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <[email protected]>
4646
static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
4747
.clock = 9000,
4848
.hdisplay = 480,
49-
@@ -4702,6 +4728,9 @@ static const struct of_device_id platfor
49+
@@ -4704,6 +4730,9 @@ static const struct of_device_id platfor
5050
.compatible = "friendlyarm,hd702e",
5151
.data = &friendlyarm_hd702e,
5252
}, {

‎target/linux/generic/backport-5.15/703-03-v5.16-net-dsa-populate-supported_interfaces-member.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <[email protected]>
3737
struct phylink_link_state *state);
3838
--- a/net/dsa/port.c
3939
+++ b/net/dsa/port.c
40-
@@ -1172,6 +1172,10 @@ static int dsa_port_phylink_register(str
40+
@@ -1188,6 +1188,10 @@ static int dsa_port_phylink_register(str
4141
dp->pl_config.type = PHYLINK_DEV;
4242
dp->pl_config.pcs_poll = ds->pcs_poll;
4343

‎target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
2121

2222
--- a/net/dsa/dsa_priv.h
2323
+++ b/net/dsa/dsa_priv.h
24-
@@ -260,13 +260,13 @@ int dsa_port_mrp_add_ring_role(const str
24+
@@ -261,13 +261,13 @@ int dsa_port_mrp_add_ring_role(const str
2525
const struct switchdev_obj_ring_role_mrp *mrp);
2626
int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,
2727
const struct switchdev_obj_ring_role_mrp *mrp);
@@ -38,7 +38,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
3838
const struct net_device *dev)
3939
--- a/net/dsa/port.c
4040
+++ b/net/dsa/port.c
41-
@@ -1076,7 +1076,7 @@ static void dsa_port_phylink_mac_link_up
41+
@@ -1092,7 +1092,7 @@ static void dsa_port_phylink_mac_link_up
4242
speed, duplex, tx_pause, rx_pause);
4343
}
4444

@@ -47,7 +47,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
4747
.validate = dsa_port_phylink_validate,
4848
.mac_pcs_get_state = dsa_port_phylink_mac_pcs_get_state,
4949
.mac_config = dsa_port_phylink_mac_config,
50-
@@ -1085,6 +1085,30 @@ const struct phylink_mac_ops dsa_port_ph
50+
@@ -1101,6 +1101,30 @@ const struct phylink_mac_ops dsa_port_ph
5151
.mac_link_up = dsa_port_phylink_mac_link_up,
5252
};
5353

@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
7878
static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)
7979
{
8080
struct dsa_switch *ds = dp->ds;
81-
@@ -1161,27 +1185,15 @@ static int dsa_port_phylink_register(str
81+
@@ -1177,27 +1201,15 @@ static int dsa_port_phylink_register(str
8282
{
8383
struct dsa_switch *ds = dp->ds;
8484
struct device_node *port_dn = dp->dn;

‎target/linux/generic/backport-5.15/703-05-v5.17-net-dsa-replace-phylink_get_interfaces-with-phylink_.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
3737
struct phylink_link_state *state);
3838
--- a/net/dsa/port.c
3939
+++ b/net/dsa/port.c
40-
@@ -1095,9 +1095,8 @@ int dsa_port_phylink_create(struct dsa_p
40+
@@ -1111,9 +1111,8 @@ int dsa_port_phylink_create(struct dsa_p
4141
if (err)
4242
mode = PHY_INTERFACE_MODE_NA;
4343

‎target/linux/generic/backport-5.15/703-06-v5.18-net-dsa-add-support-for-phylink-mac_select_pcs.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <[email protected]>
2828
void (*phylink_mac_config)(struct dsa_switch *ds, int port,
2929
--- a/net/dsa/port.c
3030
+++ b/net/dsa/port.c
31-
@@ -1012,6 +1012,20 @@ static void dsa_port_phylink_mac_pcs_get
31+
@@ -1028,6 +1028,20 @@ static void dsa_port_phylink_mac_pcs_get
3232
}
3333
}
3434

@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <[email protected]>
4949
static void dsa_port_phylink_mac_config(struct phylink_config *config,
5050
unsigned int mode,
5151
const struct phylink_link_state *state)
52-
@@ -1078,6 +1092,7 @@ static void dsa_port_phylink_mac_link_up
52+
@@ -1094,6 +1108,7 @@ static void dsa_port_phylink_mac_link_up
5353

5454
static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {
5555
.validate = dsa_port_phylink_validate,

‎target/linux/generic/backport-5.15/703-13-v5.17-net-dsa-mark-DSA-phylink-as-legacy_pre_march2020.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
2020

2121
--- a/net/dsa/port.c
2222
+++ b/net/dsa/port.c
23-
@@ -1110,6 +1110,13 @@ int dsa_port_phylink_create(struct dsa_p
23+
@@ -1126,6 +1126,13 @@ int dsa_port_phylink_create(struct dsa_p
2424
if (err)
2525
mode = PHY_INTERFACE_MODE_NA;
2626

‎target/linux/generic/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
7676
if (iface == PHY_INTERFACE_MODE_MOCA)
7777
--- a/net/dsa/port.c
7878
+++ b/net/dsa/port.c
79-
@@ -1017,8 +1017,8 @@ dsa_port_phylink_mac_select_pcs(struct p
79+
@@ -1033,8 +1033,8 @@ dsa_port_phylink_mac_select_pcs(struct p
8080
phy_interface_t interface)
8181
{
8282
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);

‎target/linux/generic/backport-5.15/765-v5.17-03-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <[email protected]>
3737

3838
--- a/net/dsa/master.c
3939
+++ b/net/dsa/master.c
40-
@@ -330,28 +330,13 @@ static const struct attribute_group dsa_
40+
@@ -329,28 +329,13 @@ static const struct attribute_group dsa_
4141
.attrs = dsa_slave_attrs,
4242
};
4343

@@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <[email protected]>
6767

6868
/* The DSA master must use SET_NETDEV_DEV for this to work. */
6969
consumer_link = device_link_add(ds->dev, dev->dev.parent,
70-
@@ -361,13 +346,6 @@ int dsa_master_setup(struct net_device *
70+
@@ -360,13 +345,6 @@ int dsa_master_setup(struct net_device *
7171
"Failed to create a device link to DSA switch %s\n",
7272
dev_name(ds->dev));
7373

@@ -81,7 +81,7 @@ Signed-off-by: David S. Miller <[email protected]>
8181
/* If we use a tagging format that doesn't have an ethertype
8282
* field, make sure that all packets from this point on get
8383
* sent to the tag format's receive function.
84-
@@ -405,7 +383,6 @@ void dsa_master_teardown(struct net_devi
84+
@@ -404,7 +382,6 @@ void dsa_master_teardown(struct net_devi
8585
sysfs_remove_group(&dev->dev.kobj, &dsa_group);
8686
dsa_netdev_ops_set(dev, NULL);
8787
dsa_master_ethtool_teardown(dev);

‎target/linux/generic/backport-5.15/765-v5.17-04-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <[email protected]>
6464
static int dsa_tree_setup_lags(struct dsa_switch_tree *dst)
6565
--- a/net/dsa/master.c
6666
+++ b/net/dsa/master.c
67-
@@ -267,9 +267,9 @@ static void dsa_master_set_promiscuity(s
67+
@@ -266,9 +266,9 @@ static void dsa_master_set_promiscuity(s
6868
if (!ops->promisc_on_master)
6969
return;
7070

‎target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Signed-off-by: David S. Miller <[email protected]>
160160
struct dsa_switchdev_event_work {
161161
struct dsa_switch *ds;
162162
int port;
163-
@@ -548,6 +555,12 @@ int dsa_tree_change_tag_proto(struct dsa
163+
@@ -549,6 +556,12 @@ int dsa_tree_change_tag_proto(struct dsa
164164
struct net_device *master,
165165
const struct dsa_device_ops *tag_ops,
166166
const struct dsa_device_ops *old_tag_ops);

‎target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
8787
stmmac_clear_tx_descriptors(priv, queue);
8888

8989
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
90-
@@ -7387,6 +7382,25 @@ int stmmac_suspend(struct device *dev)
90+
@@ -7390,6 +7385,25 @@ int stmmac_suspend(struct device *dev)
9191
}
9292
EXPORT_SYMBOL_GPL(stmmac_suspend);
9393

@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
113113
/**
114114
* stmmac_reset_queues_param - reset queue parameters
115115
* @priv: device pointer
116-
@@ -7397,22 +7411,11 @@ static void stmmac_reset_queues_param(st
116+
@@ -7400,22 +7414,11 @@ static void stmmac_reset_queues_param(st
117117
u32 tx_cnt = priv->plat->tx_queues_to_use;
118118
u32 queue;
119119

‎target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch

+10-10
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
11431143
struct stmmac_channel *ch = &priv->channel[queue];
11441144
unsigned long flags;
11451145
int ret;
1146-
@@ -6493,7 +6497,7 @@ void stmmac_xdp_release(struct net_devic
1146+
@@ -6496,7 +6500,7 @@ void stmmac_xdp_release(struct net_devic
11471147
stmmac_disable_all_queues(priv);
11481148

11491149
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
@@ -1152,7 +1152,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
11521152

11531153
/* Free the IRQ lines */
11541154
stmmac_free_irq(dev, REQ_IRQ_ERR_ALL, 0);
1155-
@@ -6552,7 +6556,7 @@ int stmmac_xdp_open(struct net_device *d
1155+
@@ -6555,7 +6559,7 @@ int stmmac_xdp_open(struct net_device *d
11561156

11571157
/* DMA RX Channel Configuration */
11581158
for (chan = 0; chan < rx_cnt; chan++) {
@@ -1161,7 +1161,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
11611161

11621162
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
11631163
rx_q->dma_rx_phy, chan);
1164-
@@ -6570,7 +6574,7 @@ int stmmac_xdp_open(struct net_device *d
1164+
@@ -6573,7 +6577,7 @@ int stmmac_xdp_open(struct net_device *d
11651165
rx_q->queue_index);
11661166
} else {
11671167
stmmac_set_dma_bfsize(priv, priv->ioaddr,
@@ -1170,7 +1170,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
11701170
rx_q->queue_index);
11711171
}
11721172

1173-
@@ -6579,7 +6583,7 @@ int stmmac_xdp_open(struct net_device *d
1173+
@@ -6582,7 +6586,7 @@ int stmmac_xdp_open(struct net_device *d
11741174

11751175
/* DMA TX Channel Configuration */
11761176
for (chan = 0; chan < tx_cnt; chan++) {
@@ -1179,7 +1179,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
11791179

11801180
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
11811181
tx_q->dma_tx_phy, chan);
1182-
@@ -6612,7 +6616,7 @@ int stmmac_xdp_open(struct net_device *d
1182+
@@ -6615,7 +6619,7 @@ int stmmac_xdp_open(struct net_device *d
11831183

11841184
irq_error:
11851185
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
@@ -1188,7 +1188,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
11881188

11891189
stmmac_hw_teardown(dev);
11901190
init_error:
1191-
@@ -6639,8 +6643,8 @@ int stmmac_xsk_wakeup(struct net_device
1191+
@@ -6642,8 +6646,8 @@ int stmmac_xsk_wakeup(struct net_device
11921192
queue >= priv->plat->tx_queues_to_use)
11931193
return -EINVAL;
11941194

@@ -1199,7 +1199,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
11991199
ch = &priv->channel[queue];
12001200

12011201
if (!rx_q->xsk_pool && !tx_q->xsk_pool)
1202-
@@ -6896,8 +6900,8 @@ int stmmac_reinit_ringparam(struct net_d
1202+
@@ -6899,8 +6903,8 @@ int stmmac_reinit_ringparam(struct net_d
12031203
if (netif_running(dev))
12041204
stmmac_release(dev);
12051205

@@ -1210,7 +1210,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
12101210

12111211
if (netif_running(dev))
12121212
ret = stmmac_open(dev);
1213-
@@ -7333,7 +7337,7 @@ int stmmac_suspend(struct device *dev)
1213+
@@ -7336,7 +7340,7 @@ int stmmac_suspend(struct device *dev)
12141214
stmmac_disable_all_queues(priv);
12151215

12161216
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
@@ -1219,7 +1219,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
12191219

12201220
if (priv->eee_enabled) {
12211221
priv->tx_path_in_lpi_mode = false;
1222-
@@ -7384,7 +7388,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend);
1222+
@@ -7387,7 +7391,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend);
12231223

12241224
static void stmmac_reset_rx_queue(struct stmmac_priv *priv, u32 queue)
12251225
{
@@ -1228,7 +1228,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
12281228

12291229
rx_q->cur_rx = 0;
12301230
rx_q->dirty_rx = 0;
1231-
@@ -7392,7 +7396,7 @@ static void stmmac_reset_rx_queue(struct
1231+
@@ -7395,7 +7399,7 @@ static void stmmac_reset_rx_queue(struct
12321232

12331233
static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue)
12341234
{

0 commit comments

Comments
 (0)