mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-10 08:44:39 +01:00
kernel: bump 6.6 to 6.6.117
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.117 All patches auto-refreshed. Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com> Link: https://github.com/openwrt/openwrt/pull/20927 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
d711d906ad
commit
0337cdfb33
23 changed files with 44 additions and 44 deletions
|
|
@ -108,7 +108,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
#endif
|
#endif
|
||||||
--- a/net/core/skbuff.c
|
--- a/net/core/skbuff.c
|
||||||
+++ b/net/core/skbuff.c
|
+++ b/net/core/skbuff.c
|
||||||
@@ -6863,8 +6863,8 @@ nodefer: __kfree_skb(skb);
|
@@ -6867,8 +6867,8 @@ nodefer: __kfree_skb(skb);
|
||||||
/* Make sure to trigger NET_RX_SOFTIRQ on the remote CPU
|
/* Make sure to trigger NET_RX_SOFTIRQ on the remote CPU
|
||||||
* if we are unlucky enough (this seems very unlikely).
|
* if we are unlucky enough (this seems very unlikely).
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
static int m88e1111_config_aneg(struct phy_device *phydev)
|
static int m88e1111_config_aneg(struct phy_device *phydev)
|
||||||
{
|
{
|
||||||
int extsr = phy_read(phydev, MII_M1111_PHY_EXT_SR);
|
int extsr = phy_read(phydev, MII_M1111_PHY_EXT_SR);
|
||||||
@@ -3292,6 +3306,7 @@ static struct phy_driver marvell_drivers
|
@@ -3329,6 +3343,7 @@ static struct phy_driver marvell_drivers
|
||||||
.name = "Marvell 88E1112",
|
.name = "Marvell 88E1112",
|
||||||
/* PHY_GBIT_FEATURES */
|
/* PHY_GBIT_FEATURES */
|
||||||
.probe = marvell_probe,
|
.probe = marvell_probe,
|
||||||
|
|
@ -45,7 +45,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
.config_init = m88e1112_config_init,
|
.config_init = m88e1112_config_init,
|
||||||
.config_aneg = marvell_config_aneg,
|
.config_aneg = marvell_config_aneg,
|
||||||
.config_intr = marvell_config_intr,
|
.config_intr = marvell_config_intr,
|
||||||
@@ -3312,6 +3327,7 @@ static struct phy_driver marvell_drivers
|
@@ -3349,6 +3364,7 @@ static struct phy_driver marvell_drivers
|
||||||
.name = "Marvell 88E1111",
|
.name = "Marvell 88E1111",
|
||||||
/* PHY_GBIT_FEATURES */
|
/* PHY_GBIT_FEATURES */
|
||||||
.probe = marvell_probe,
|
.probe = marvell_probe,
|
||||||
|
|
@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
.config_init = m88e1111gbe_config_init,
|
.config_init = m88e1111gbe_config_init,
|
||||||
.config_aneg = m88e1111_config_aneg,
|
.config_aneg = m88e1111_config_aneg,
|
||||||
.read_status = marvell_read_status,
|
.read_status = marvell_read_status,
|
||||||
@@ -3333,6 +3349,7 @@ static struct phy_driver marvell_drivers
|
@@ -3370,6 +3386,7 @@ static struct phy_driver marvell_drivers
|
||||||
.name = "Marvell 88E1111 (Finisar)",
|
.name = "Marvell 88E1111 (Finisar)",
|
||||||
/* PHY_GBIT_FEATURES */
|
/* PHY_GBIT_FEATURES */
|
||||||
.probe = marvell_probe,
|
.probe = marvell_probe,
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
static int m88e1111_config_aneg(struct phy_device *phydev)
|
static int m88e1111_config_aneg(struct phy_device *phydev)
|
||||||
{
|
{
|
||||||
int extsr = phy_read(phydev, MII_M1111_PHY_EXT_SR);
|
int extsr = phy_read(phydev, MII_M1111_PHY_EXT_SR);
|
||||||
@@ -3307,6 +3335,7 @@ static struct phy_driver marvell_drivers
|
@@ -3344,6 +3372,7 @@ static struct phy_driver marvell_drivers
|
||||||
/* PHY_GBIT_FEATURES */
|
/* PHY_GBIT_FEATURES */
|
||||||
.probe = marvell_probe,
|
.probe = marvell_probe,
|
||||||
.inband_caps = m88e1111_inband_caps,
|
.inband_caps = m88e1111_inband_caps,
|
||||||
|
|
@ -59,7 +59,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
.config_init = m88e1112_config_init,
|
.config_init = m88e1112_config_init,
|
||||||
.config_aneg = marvell_config_aneg,
|
.config_aneg = marvell_config_aneg,
|
||||||
.config_intr = marvell_config_intr,
|
.config_intr = marvell_config_intr,
|
||||||
@@ -3328,6 +3357,7 @@ static struct phy_driver marvell_drivers
|
@@ -3365,6 +3394,7 @@ static struct phy_driver marvell_drivers
|
||||||
/* PHY_GBIT_FEATURES */
|
/* PHY_GBIT_FEATURES */
|
||||||
.probe = marvell_probe,
|
.probe = marvell_probe,
|
||||||
.inband_caps = m88e1111_inband_caps,
|
.inband_caps = m88e1111_inband_caps,
|
||||||
|
|
@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
.config_init = m88e1111gbe_config_init,
|
.config_init = m88e1111gbe_config_init,
|
||||||
.config_aneg = m88e1111_config_aneg,
|
.config_aneg = m88e1111_config_aneg,
|
||||||
.read_status = marvell_read_status,
|
.read_status = marvell_read_status,
|
||||||
@@ -3350,6 +3380,7 @@ static struct phy_driver marvell_drivers
|
@@ -3387,6 +3417,7 @@ static struct phy_driver marvell_drivers
|
||||||
/* PHY_GBIT_FEATURES */
|
/* PHY_GBIT_FEATURES */
|
||||||
.probe = marvell_probe,
|
.probe = marvell_probe,
|
||||||
.inband_caps = m88e1111_inband_caps,
|
.inband_caps = m88e1111_inband_caps,
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
static inline bool page_pool_put(struct page_pool *pool)
|
static inline bool page_pool_put(struct page_pool *pool)
|
||||||
--- a/net/core/page_pool.c
|
--- a/net/core/page_pool.c
|
||||||
+++ b/net/core/page_pool.c
|
+++ b/net/core/page_pool.c
|
||||||
@@ -211,10 +211,6 @@ static int page_pool_init(struct page_po
|
@@ -207,10 +207,6 @@ static int page_pool_init(struct page_po
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -115,7 +115,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
#ifdef CONFIG_PAGE_POOL_STATS
|
#ifdef CONFIG_PAGE_POOL_STATS
|
||||||
pool->recycle_stats = alloc_percpu(struct page_pool_recycle_stats);
|
pool->recycle_stats = alloc_percpu(struct page_pool_recycle_stats);
|
||||||
if (!pool->recycle_stats)
|
if (!pool->recycle_stats)
|
||||||
@@ -363,12 +359,20 @@ static bool page_pool_dma_map(struct pag
|
@@ -359,12 +355,20 @@ static bool page_pool_dma_map(struct pag
|
||||||
if (dma_mapping_error(pool->p.dev, dma))
|
if (dma_mapping_error(pool->p.dev, dma))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
page_pool_put_defragged_page(pool, page, dma_sync_size, allow_direct);
|
page_pool_put_defragged_page(pool, page, dma_sync_size, allow_direct);
|
||||||
--- a/net/core/page_pool.c
|
--- a/net/core/page_pool.c
|
||||||
+++ b/net/core/page_pool.c
|
+++ b/net/core/page_pool.c
|
||||||
@@ -380,6 +380,14 @@ static void page_pool_set_pp_info(struct
|
@@ -376,6 +376,14 @@ static void page_pool_set_pp_info(struct
|
||||||
{
|
{
|
||||||
page->pp = pool;
|
page->pp = pool;
|
||||||
page->pp_magic |= PP_SIGNATURE;
|
page->pp_magic |= PP_SIGNATURE;
|
||||||
|
|
@ -162,7 +162,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
if (pool->p.init_callback)
|
if (pool->p.init_callback)
|
||||||
pool->p.init_callback(page, pool->p.init_arg);
|
pool->p.init_callback(page, pool->p.init_arg);
|
||||||
}
|
}
|
||||||
@@ -676,7 +684,7 @@ void page_pool_put_page_bulk(struct page
|
@@ -678,7 +686,7 @@ void page_pool_put_page_bulk(struct page
|
||||||
struct page *page = virt_to_head_page(data[i]);
|
struct page *page = virt_to_head_page(data[i]);
|
||||||
|
|
||||||
/* It is not the last user for the page frag case */
|
/* It is not the last user for the page frag case */
|
||||||
|
|
@ -171,7 +171,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
page = __page_pool_put_page(pool, page, -1, false);
|
page = __page_pool_put_page(pool, page, -1, false);
|
||||||
@@ -752,8 +760,7 @@ struct page *page_pool_alloc_frag(struct
|
@@ -754,8 +762,7 @@ struct page *page_pool_alloc_frag(struct
|
||||||
unsigned int max_size = PAGE_SIZE << pool->p.order;
|
unsigned int max_size = PAGE_SIZE << pool->p.order;
|
||||||
struct page *page = pool->frag_page;
|
struct page *page = pool->frag_page;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
|
|
||||||
--- a/include/net/gro.h
|
--- a/include/net/gro.h
|
||||||
+++ b/include/net/gro.h
|
+++ b/include/net/gro.h
|
||||||
@@ -439,6 +439,7 @@ static inline __wsum ip6_gro_compute_pse
|
@@ -442,6 +442,7 @@ static inline __wsum ip6_gro_compute_pse
|
||||||
}
|
}
|
||||||
|
|
||||||
int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb);
|
int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb);
|
||||||
|
|
@ -29,7 +29,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
static inline void gro_normal_list(struct napi_struct *napi)
|
static inline void gro_normal_list(struct napi_struct *napi)
|
||||||
--- a/net/core/gro.c
|
--- a/net/core/gro.c
|
||||||
+++ b/net/core/gro.c
|
+++ b/net/core/gro.c
|
||||||
@@ -228,6 +228,33 @@ done:
|
@@ -225,6 +225,33 @@ done:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
}
|
}
|
||||||
--- a/drivers/net/phy/mdio_bus.c
|
--- a/drivers/net/phy/mdio_bus.c
|
||||||
+++ b/drivers/net/phy/mdio_bus.c
|
+++ b/drivers/net/phy/mdio_bus.c
|
||||||
@@ -456,19 +456,34 @@ EXPORT_SYMBOL(of_mdio_find_bus);
|
@@ -459,19 +459,34 @@ EXPORT_SYMBOL(of_mdio_find_bus);
|
||||||
* found, set the of_node pointer for the mdio device. This allows
|
* found, set the of_node pointer for the mdio device. This allows
|
||||||
* auto-probed phy devices to be supplied with information passed in
|
* auto-probed phy devices to be supplied with information passed in
|
||||||
* via DT.
|
* via DT.
|
||||||
|
|
@ -185,7 +185,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
addr = of_mdio_parse_addr(dev, child);
|
addr = of_mdio_parse_addr(dev, child);
|
||||||
if (addr < 0)
|
if (addr < 0)
|
||||||
continue;
|
continue;
|
||||||
@@ -478,9 +493,22 @@ static void of_mdiobus_link_mdiodev(stru
|
@@ -481,9 +496,22 @@ static void of_mdiobus_link_mdiodev(stru
|
||||||
/* The refcount on "child" is passed to the mdio
|
/* The refcount on "child" is passed to the mdio
|
||||||
* device. Do _not_ use of_node_put(child) here.
|
* device. Do _not_ use of_node_put(child) here.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
|
|
||||||
u64_stats_update_begin(&txq_stats->napi_syncp);
|
u64_stats_update_begin(&txq_stats->napi_syncp);
|
||||||
u64_stats_add(&txq_stats->napi.tx_packets, tx_packets);
|
u64_stats_add(&txq_stats->napi.tx_packets, tx_packets);
|
||||||
@@ -5611,6 +5615,7 @@ static int stmmac_napi_poll_tx(struct na
|
@@ -5609,6 +5613,7 @@ static int stmmac_napi_poll_tx(struct na
|
||||||
container_of(napi, struct stmmac_channel, tx_napi);
|
container_of(napi, struct stmmac_channel, tx_napi);
|
||||||
struct stmmac_priv *priv = ch->priv_data;
|
struct stmmac_priv *priv = ch->priv_data;
|
||||||
struct stmmac_txq_stats *txq_stats;
|
struct stmmac_txq_stats *txq_stats;
|
||||||
|
|
@ -50,7 +50,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
u32 chan = ch->index;
|
u32 chan = ch->index;
|
||||||
int work_done;
|
int work_done;
|
||||||
|
|
||||||
@@ -5619,7 +5624,7 @@ static int stmmac_napi_poll_tx(struct na
|
@@ -5617,7 +5622,7 @@ static int stmmac_napi_poll_tx(struct na
|
||||||
u64_stats_inc(&txq_stats->napi.poll);
|
u64_stats_inc(&txq_stats->napi.poll);
|
||||||
u64_stats_update_end(&txq_stats->napi_syncp);
|
u64_stats_update_end(&txq_stats->napi_syncp);
|
||||||
|
|
||||||
|
|
@ -59,7 +59,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
work_done = min(work_done, budget);
|
work_done = min(work_done, budget);
|
||||||
|
|
||||||
if (work_done < budget && napi_complete_done(napi, work_done)) {
|
if (work_done < budget && napi_complete_done(napi, work_done)) {
|
||||||
@@ -5630,6 +5635,10 @@ static int stmmac_napi_poll_tx(struct na
|
@@ -5628,6 +5633,10 @@ static int stmmac_napi_poll_tx(struct na
|
||||||
spin_unlock_irqrestore(&ch->lock, flags);
|
spin_unlock_irqrestore(&ch->lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -70,7 +70,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
return work_done;
|
return work_done;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5638,6 +5647,7 @@ static int stmmac_napi_poll_rxtx(struct
|
@@ -5636,6 +5645,7 @@ static int stmmac_napi_poll_rxtx(struct
|
||||||
struct stmmac_channel *ch =
|
struct stmmac_channel *ch =
|
||||||
container_of(napi, struct stmmac_channel, rxtx_napi);
|
container_of(napi, struct stmmac_channel, rxtx_napi);
|
||||||
struct stmmac_priv *priv = ch->priv_data;
|
struct stmmac_priv *priv = ch->priv_data;
|
||||||
|
|
@ -78,7 +78,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
int rx_done, tx_done, rxtx_done;
|
int rx_done, tx_done, rxtx_done;
|
||||||
struct stmmac_rxq_stats *rxq_stats;
|
struct stmmac_rxq_stats *rxq_stats;
|
||||||
struct stmmac_txq_stats *txq_stats;
|
struct stmmac_txq_stats *txq_stats;
|
||||||
@@ -5653,7 +5663,7 @@ static int stmmac_napi_poll_rxtx(struct
|
@@ -5651,7 +5661,7 @@ static int stmmac_napi_poll_rxtx(struct
|
||||||
u64_stats_inc(&txq_stats->napi.poll);
|
u64_stats_inc(&txq_stats->napi.poll);
|
||||||
u64_stats_update_end(&txq_stats->napi_syncp);
|
u64_stats_update_end(&txq_stats->napi_syncp);
|
||||||
|
|
||||||
|
|
@ -87,7 +87,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||||
tx_done = min(tx_done, budget);
|
tx_done = min(tx_done, budget);
|
||||||
|
|
||||||
rx_done = stmmac_rx_zc(priv, budget, chan);
|
rx_done = stmmac_rx_zc(priv, budget, chan);
|
||||||
@@ -5678,6 +5688,10 @@ static int stmmac_napi_poll_rxtx(struct
|
@@ -5676,6 +5686,10 @@ static int stmmac_napi_poll_rxtx(struct
|
||||||
spin_unlock_irqrestore(&ch->lock, flags);
|
spin_unlock_irqrestore(&ch->lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -221,7 +221,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
||||||
r8168_mac_ocp_modify(tp, 0xe63e, 0x0c30, 0x0000);
|
r8168_mac_ocp_modify(tp, 0xe63e, 0x0c30, 0x0000);
|
||||||
@@ -3611,6 +3645,10 @@ static void rtl_hw_start_8125_common(str
|
@@ -3611,6 +3645,10 @@ static void rtl_hw_start_8125_common(str
|
||||||
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
|
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
||||||
+ if (tp->mac_version == RTL_GIGA_MAC_VER_65)
|
+ if (tp->mac_version == RTL_GIGA_MAC_VER_65)
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
||||||
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
||||||
@@ -3739,7 +3748,8 @@ static void rtl_hw_start_8125_common(str
|
@@ -3739,7 +3748,8 @@ static void rtl_hw_start_8125_common(str
|
||||||
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
|
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
||||||
- if (tp->mac_version == RTL_GIGA_MAC_VER_65)
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_65)
|
||||||
|
|
|
||||||
|
|
@ -183,7 +183,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
||||||
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
||||||
@@ -3720,8 +3720,8 @@ static void rtl_hw_start_8125_common(str
|
@@ -3720,8 +3720,8 @@ static void rtl_hw_start_8125_common(str
|
||||||
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
|
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
||||||
- if (tp->mac_version == RTL_GIGA_MAC_VER_65 ||
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_65 ||
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
||||||
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
||||||
@@ -3718,8 +3714,7 @@ static void rtl_hw_start_8125_common(str
|
@@ -3718,8 +3714,7 @@ static void rtl_hw_start_8125_common(str
|
||||||
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
|
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
||||||
- if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
||||||
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
||||||
@@ -3712,7 +3724,8 @@ static void rtl_hw_start_8125_common(str
|
@@ -3712,7 +3724,8 @@ static void rtl_hw_start_8125_common(str
|
||||||
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
|
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
||||||
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
||||||
- if (tp->mac_version == RTL_GIGA_MAC_VER_70)
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_70)
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -21990,6 +21990,7 @@ U-BOOT ENVIRONMENT VARIABLES
|
@@ -21991,6 +21991,7 @@ U-BOOT ENVIRONMENT VARIABLES
|
||||||
M: Rafał Miłecki <rafal@milecki.pl>
|
M: Rafał Miłecki <rafal@milecki.pl>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
|
F: Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/core/page_pool.c
|
--- a/net/core/page_pool.c
|
||||||
+++ b/net/core/page_pool.c
|
+++ b/net/core/page_pool.c
|
||||||
@@ -873,7 +873,8 @@ static void page_pool_release_retry(stru
|
@@ -875,7 +875,8 @@ static void page_pool_release_retry(stru
|
||||||
{
|
{
|
||||||
struct delayed_work *dwq = to_delayed_work(wq);
|
struct delayed_work *dwq = to_delayed_work(wq);
|
||||||
struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw);
|
struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw);
|
||||||
|
|
@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
inflight = page_pool_release(pool);
|
inflight = page_pool_release(pool);
|
||||||
/* In rare cases, a driver bug may cause inflight to go negative.
|
/* In rare cases, a driver bug may cause inflight to go negative.
|
||||||
@@ -885,6 +886,21 @@ static void page_pool_release_retry(stru
|
@@ -887,6 +888,21 @@ static void page_pool_release_retry(stru
|
||||||
if (inflight <= 0)
|
if (inflight <= 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
#include <net/protocol.h>
|
#include <net/protocol.h>
|
||||||
#include <net/dst.h>
|
#include <net/dst.h>
|
||||||
@@ -844,6 +845,22 @@ skb_fail:
|
@@ -848,6 +849,22 @@ skb_fail:
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(__napi_alloc_skb);
|
EXPORT_SYMBOL(__napi_alloc_skb);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
||||||
|
|
||||||
--- a/drivers/net/usb/qmi_wwan.c
|
--- a/drivers/net/usb/qmi_wwan.c
|
||||||
+++ b/drivers/net/usb/qmi_wwan.c
|
+++ b/drivers/net/usb/qmi_wwan.c
|
||||||
@@ -1084,6 +1084,11 @@ static const struct usb_device_id produc
|
@@ -1090,6 +1090,11 @@ static const struct usb_device_id produc
|
||||||
USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
|
USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
|
||||||
.driver_info = (unsigned long)&qmi_wwan_info,
|
.driver_info = (unsigned long)&qmi_wwan_info,
|
||||||
},
|
},
|
||||||
|
|
@ -22,7 +22,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0122)}, /* Quectel RG650V */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0122)}, /* Quectel RG650V */
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)}, /* Quectel EP06/EG06/EM06 */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)}, /* Quectel EP06/EG06/EM06 */
|
||||||
@@ -1091,6 +1096,7 @@ static const struct usb_device_id produc
|
@@ -1097,6 +1102,7 @@ static const struct usb_device_id produc
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */
|
||||||
|
|
|
||||||
|
|
@ -246,7 +246,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
&vmalloc_op,
|
&vmalloc_op,
|
||||||
--- a/mm/vmstat.c
|
--- a/mm/vmstat.c
|
||||||
+++ b/mm/vmstat.c
|
+++ b/mm/vmstat.c
|
||||||
@@ -2136,10 +2136,12 @@ void __init init_mm_internals(void)
|
@@ -2137,10 +2137,12 @@ void __init init_mm_internals(void)
|
||||||
start_shepherd_timer();
|
start_shepherd_timer();
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
|
|
@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/core/sock.c
|
--- a/net/core/sock.c
|
||||||
+++ b/net/core/sock.c
|
+++ b/net/core/sock.c
|
||||||
@@ -4165,6 +4165,8 @@ static __net_initdata struct pernet_oper
|
@@ -4168,6 +4168,8 @@ static __net_initdata struct pernet_oper
|
||||||
|
|
||||||
static int __init proto_init(void)
|
static int __init proto_init(void)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
LINUX_VERSION-6.6 = .116
|
LINUX_VERSION-6.6 = .117
|
||||||
LINUX_KERNEL_HASH-6.6.116 = a9a59742c29be284c205dc87cbe9b065f9688488132c8f5a6057a5539230a51d
|
LINUX_KERNEL_HASH-6.6.117 = 643b31079222fdbda70cfdd0b68c514f05a3926104be4762a4685f62818b43d1
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||||
|
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -22017,6 +22017,12 @@ F: Documentation/filesystems/ubifs-authe
|
@@ -22018,6 +22018,12 @@ F: Documentation/filesystems/ubifs-authe
|
||||||
F: Documentation/filesystems/ubifs.rst
|
F: Documentation/filesystems/ubifs.rst
|
||||||
F: fs/ubifs/
|
F: fs/ubifs/
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/netfilter/nf_tables_api.c
|
--- a/net/netfilter/nf_tables_api.c
|
||||||
+++ b/net/netfilter/nf_tables_api.c
|
+++ b/net/netfilter/nf_tables_api.c
|
||||||
@@ -8448,7 +8448,7 @@ static int nft_register_flowtable_net_ho
|
@@ -8463,7 +8463,7 @@ static int nft_register_flowtable_net_ho
|
||||||
err = flowtable->data.type->setup(&flowtable->data,
|
err = flowtable->data.type->setup(&flowtable->data,
|
||||||
hook->ops.dev,
|
hook->ops.dev,
|
||||||
FLOW_BLOCK_BIND);
|
FLOW_BLOCK_BIND);
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/bridge/br_forward.c
|
--- a/net/bridge/br_forward.c
|
||||||
+++ b/net/bridge/br_forward.c
|
+++ b/net/bridge/br_forward.c
|
||||||
@@ -201,6 +201,7 @@ void br_flood(struct net_bridge *br, str
|
@@ -202,6 +202,7 @@ void br_flood(struct net_bridge *br, str
|
||||||
enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,
|
enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,
|
||||||
u16 vid)
|
u16 vid)
|
||||||
{
|
{
|
||||||
|
|
@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
struct net_bridge_port *prev = NULL;
|
struct net_bridge_port *prev = NULL;
|
||||||
struct net_bridge_port *p;
|
struct net_bridge_port *p;
|
||||||
|
|
||||||
@@ -218,6 +219,10 @@ void br_flood(struct net_bridge *br, str
|
@@ -219,6 +220,10 @@ void br_flood(struct net_bridge *br, str
|
||||||
case BR_PKT_MULTICAST:
|
case BR_PKT_MULTICAST:
|
||||||
if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
|
if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
/*
|
/*
|
||||||
* The Mellanox Tavor device gives false positive parity errors. Disable
|
* The Mellanox Tavor device gives false positive parity errors. Disable
|
||||||
* parity error reporting.
|
* parity error reporting.
|
||||||
@@ -3501,6 +3502,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
|
@@ -3502,6 +3503,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
|
||||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
|
||||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
/*
|
/*
|
||||||
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
|
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
|
||||||
* To work around this, query the size it should be configured to by the
|
* To work around this, query the size it should be configured to by the
|
||||||
@@ -3526,6 +3529,8 @@ static void quirk_intel_ntb(struct pci_d
|
@@ -3527,6 +3530,8 @@ static void quirk_intel_ntb(struct pci_d
|
||||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
|
||||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
|
||||||
|
|
||||||
|
|
@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
/*
|
/*
|
||||||
* Some BIOS implementations leave the Intel GPU interrupts enabled, even
|
* Some BIOS implementations leave the Intel GPU interrupts enabled, even
|
||||||
* though no one is handling them (e.g., if the i915 driver is never
|
* though no one is handling them (e.g., if the i915 driver is never
|
||||||
@@ -3564,6 +3569,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
|
@@ -3565,6 +3570,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
|
||||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
|
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
|
||||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
|
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue