mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-15 18:03:30 +00:00
kernel: bump to 5.4.244, 6.1.31 (#11265)
This commit is contained in:
parent
2c0b86e3f2
commit
1858af4e68
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.4 = .243
|
||||
LINUX_KERNEL_HASH-5.4.243 = c3cf664feeeee47e0f0c45c53705568f73692c37a3ff7f11c1b15e59610feb04
|
||||
LINUX_VERSION-5.4 = .244
|
||||
LINUX_KERNEL_HASH-5.4.244 = 90f5280e95ed7b374ad6f3979ed08008e29a051e5f372d367c06ed75b002a21b
|
||||
|
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.1 = .30
|
||||
LINUX_KERNEL_HASH-6.1.30 = 1bf254c4ca9ebccb25328296584fb5e87ad635ae0c1cc1deb0b5bb37a4608813
|
||||
LINUX_VERSION-6.1 = .31
|
||||
LINUX_KERNEL_HASH-6.1.31 = e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1
|
||||
|
@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -5438,8 +5438,7 @@ static inline void skb_gro_reset_offset(
|
||||
@@ -5440,8 +5440,7 @@ static inline void skb_gro_reset_offset(
|
||||
NAPI_GRO_CB(skb)->frag0 = NULL;
|
||||
NAPI_GRO_CB(skb)->frag0_len = 0;
|
||||
|
||||
|
@ -1833,7 +1833,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
}
|
||||
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
||||
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
||||
@@ -3459,10 +3459,11 @@ static int bcmgenet_probe(struct platfor
|
||||
@@ -3460,10 +3460,11 @@ static int bcmgenet_probe(struct platfor
|
||||
const struct of_device_id *of_id = NULL;
|
||||
struct bcmgenet_priv *priv;
|
||||
struct net_device *dev;
|
||||
@ -1846,7 +1846,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
/* Up to GENET_MAX_MQ_CNT + 1 TX queues and RX queues */
|
||||
dev = alloc_etherdev_mqs(sizeof(*priv), GENET_MAX_MQ_CNT + 1,
|
||||
@@ -3489,14 +3490,15 @@ static int bcmgenet_probe(struct platfor
|
||||
@@ -3490,14 +3491,15 @@ static int bcmgenet_probe(struct platfor
|
||||
}
|
||||
|
||||
if (dn) {
|
||||
@ -1865,7 +1865,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
}
|
||||
|
||||
priv->base = devm_platform_ioremap_resource(pdev, 0);
|
||||
@@ -3509,7 +3511,6 @@ static int bcmgenet_probe(struct platfor
|
||||
@@ -3510,7 +3512,6 @@ static int bcmgenet_probe(struct platfor
|
||||
|
||||
SET_NETDEV_DEV(dev, &pdev->dev);
|
||||
dev_set_drvdata(&pdev->dev, dev);
|
||||
|
@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -10530,6 +10530,22 @@ void netdev_set_default_ethtool_ops(stru
|
||||
@@ -10532,6 +10532,22 @@ void netdev_set_default_ethtool_ops(stru
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops);
|
||||
|
||||
|
@ -558,7 +558,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
start));
|
||||
s->tx_packets += packets;
|
||||
s->tx_bytes += bytes;
|
||||
@@ -1273,9 +1273,9 @@ void gve_handle_report_stats(struct gve_
|
||||
@@ -1260,9 +1260,9 @@ void gve_handle_report_stats(struct gve_
|
||||
}
|
||||
|
||||
do {
|
||||
@ -1806,7 +1806,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
static int
|
||||
--- a/drivers/net/team/team.c
|
||||
+++ b/drivers/net/team/team.c
|
||||
@@ -1865,13 +1865,13 @@ team_get_stats64(struct net_device *dev,
|
||||
@@ -1866,13 +1866,13 @@ team_get_stats64(struct net_device *dev,
|
||||
for_each_possible_cpu(i) {
|
||||
p = per_cpu_ptr(team->pcpu_stats, i);
|
||||
do {
|
||||
@ -1886,7 +1886,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
result->xdp_packets += packets;
|
||||
--- a/drivers/net/virtio_net.c
|
||||
+++ b/drivers/net/virtio_net.c
|
||||
@@ -2075,18 +2075,18 @@ static void virtnet_stats(struct net_dev
|
||||
@@ -2105,18 +2105,18 @@ static void virtnet_stats(struct net_dev
|
||||
struct send_queue *sq = &vi->sq[i];
|
||||
|
||||
do {
|
||||
@ -1909,7 +1909,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
|
||||
tot->rx_packets += rpackets;
|
||||
tot->tx_packets += tpackets;
|
||||
@@ -2697,12 +2697,12 @@ static void virtnet_get_ethtool_stats(st
|
||||
@@ -2724,12 +2724,12 @@ static void virtnet_get_ethtool_stats(st
|
||||
|
||||
stats_base = (u8 *)&rq->stats;
|
||||
do {
|
||||
@ -1924,7 +1924,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
idx += VIRTNET_RQ_STATS_LEN;
|
||||
}
|
||||
|
||||
@@ -2711,12 +2711,12 @@ static void virtnet_get_ethtool_stats(st
|
||||
@@ -2738,12 +2738,12 @@ static void virtnet_get_ethtool_stats(st
|
||||
|
||||
stats_base = (u8 *)&sq->stats;
|
||||
do {
|
||||
|
@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
help
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -3202,10 +3202,20 @@ static int xmit_one(struct sk_buff *skb,
|
||||
@@ -3204,10 +3204,20 @@ static int xmit_one(struct sk_buff *skb,
|
||||
if (dev_nit_active(dev))
|
||||
dev_queue_xmit_nit(skb, dev);
|
||||
|
||||
|
@ -80,7 +80,7 @@
|
||||
struct net_bridge_port *p;
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -3199,9 +3199,17 @@ static int xmit_one(struct sk_buff *skb,
|
||||
@@ -3201,9 +3201,17 @@ static int xmit_one(struct sk_buff *skb,
|
||||
unsigned int len;
|
||||
int rc;
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
|
||||
if (!dev->eth_mangle_tx ||
|
||||
(skb = dev->eth_mangle_tx(dev, skb)) != NULL)
|
||||
@@ -4717,6 +4725,11 @@ void netdev_rx_handler_unregister(struct
|
||||
@@ -4719,6 +4727,11 @@ void netdev_rx_handler_unregister(struct
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
|
||||
|
||||
@ -111,7 +111,7 @@
|
||||
/*
|
||||
* Limit the use of PFMEMALLOC reserves to those protocols that implement
|
||||
* the special handling of PFMEMALLOC skbs.
|
||||
@@ -4767,6 +4780,10 @@ static int __netif_receive_skb_core(stru
|
||||
@@ -4769,6 +4782,10 @@ static int __netif_receive_skb_core(stru
|
||||
int ret = NET_RX_DROP;
|
||||
__be16 type;
|
||||
|
||||
@ -122,7 +122,7 @@
|
||||
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
|
||||
|
||||
trace_netif_receive_skb(skb);
|
||||
@@ -4806,6 +4823,16 @@ another_round:
|
||||
@@ -4808,6 +4825,16 @@ another_round:
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -92,7 +92,7 @@
|
||||
struct net_bridge_port *p;
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -3584,9 +3584,17 @@ static int xmit_one(struct sk_buff *skb,
|
||||
@@ -3586,9 +3586,17 @@ static int xmit_one(struct sk_buff *skb,
|
||||
{
|
||||
unsigned int len;
|
||||
int rc;
|
||||
@ -111,7 +111,7 @@
|
||||
|
||||
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
|
||||
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
|
||||
@@ -5245,6 +5253,11 @@ void netdev_rx_handler_unregister(struct
|
||||
@@ -5247,6 +5255,11 @@ void netdev_rx_handler_unregister(struct
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
|
||||
|
||||
@ -123,7 +123,7 @@
|
||||
/*
|
||||
* Limit the use of PFMEMALLOC reserves to those protocols that implement
|
||||
* the special handling of PFMEMALLOC skbs.
|
||||
@@ -5293,6 +5306,10 @@ static int __netif_receive_skb_core(stru
|
||||
@@ -5295,6 +5308,10 @@ static int __netif_receive_skb_core(stru
|
||||
int ret = NET_RX_DROP;
|
||||
__be16 type;
|
||||
|
||||
@ -134,7 +134,7 @@
|
||||
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
|
||||
|
||||
trace_netif_receive_skb(skb);
|
||||
@@ -5330,6 +5347,15 @@ another_round:
|
||||
@@ -5332,6 +5349,15 @@ another_round:
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
goto out;
|
||||
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
@@ -2069,12 +2071,12 @@ static int packet_rcv(struct sk_buff *sk
|
||||
@@ -2067,12 +2069,12 @@ static int packet_rcv(struct sk_buff *sk
|
||||
unsigned int snaplen, res;
|
||||
bool is_drop_n_account = false;
|
||||
|
||||
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -2200,12 +2202,12 @@ static int tpacket_rcv(struct sk_buff *s
|
||||
@@ -2198,12 +2200,12 @@ static int tpacket_rcv(struct sk_buff *s
|
||||
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
|
||||
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
|
||||
|
||||
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -3313,6 +3315,7 @@ static int packet_create(struct net *net
|
||||
@@ -3311,6 +3313,7 @@ static int packet_create(struct net *net
|
||||
mutex_init(&po->pg_vec_lock);
|
||||
po->rollover = NULL;
|
||||
po->prot_hook.func = packet_rcv;
|
||||
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
if (sock->type == SOCK_PACKET)
|
||||
po->prot_hook.func = packet_rcv_spkt;
|
||||
@@ -3952,6 +3955,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
@@ -3950,6 +3953,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit);
|
||||
return 0;
|
||||
}
|
||||
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
default:
|
||||
return -ENOPROTOOPT;
|
||||
}
|
||||
@@ -4008,6 +4021,13 @@ static int packet_getsockopt(struct sock
|
||||
@@ -4006,6 +4019,13 @@ static int packet_getsockopt(struct sock
|
||||
case PACKET_VNET_HDR:
|
||||
val = po->has_vnet_hdr;
|
||||
break;
|
||||
|
@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
+MODULE_ALIAS("nf-flow-table-hw");
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -5770,6 +5770,13 @@ static int nf_tables_flowtable_parse_hoo
|
||||
@@ -5802,6 +5802,13 @@ static int nf_tables_flowtable_parse_hoo
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
|
||||
if (!ops)
|
||||
return -ENOMEM;
|
||||
@@ -5900,10 +5907,19 @@ static int nf_tables_newflowtable(struct
|
||||
@@ -5932,10 +5939,19 @@ static int nf_tables_newflowtable(struct
|
||||
}
|
||||
|
||||
flowtable->data.type = type;
|
||||
@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
|
||||
flowtable);
|
||||
if (err < 0)
|
||||
@@ -6029,7 +6045,8 @@ static int nf_tables_fill_flowtable_info
|
||||
@@ -6061,7 +6077,8 @@ static int nf_tables_fill_flowtable_info
|
||||
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
|
||||
nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
|
||||
nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
|
||||
|
@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
__wsum csum;
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -5504,6 +5504,9 @@ static enum gro_result dev_gro_receive(s
|
||||
@@ -5506,6 +5506,9 @@ static enum gro_result dev_gro_receive(s
|
||||
int same_flow;
|
||||
int grow;
|
||||
|
||||
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (netif_elide_gro(skb->dev))
|
||||
goto normal;
|
||||
|
||||
@@ -7306,6 +7309,48 @@ static void __netdev_adjacent_dev_unlink
|
||||
@@ -7308,6 +7311,48 @@ static void __netdev_adjacent_dev_unlink
|
||||
&upper_dev->adj_list.lower);
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@ 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,
|
||||
@@ -7356,6 +7401,7 @@ static int __netdev_upper_dev_link(struc
|
||||
@@ -7358,6 +7403,7 @@ static int __netdev_upper_dev_link(struc
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
||||
&changeupper_info.info);
|
||||
ret = notifier_to_errno(ret);
|
||||
@@ -7449,6 +7495,7 @@ void netdev_upper_dev_unlink(struct net_
|
||||
@@ -7451,6 +7497,7 @@ void netdev_upper_dev_unlink(struct net_
|
||||
|
||||
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
|
||||
|
||||
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
||||
&changeupper_info.info);
|
||||
|
||||
@@ -8179,6 +8226,7 @@ int dev_set_mac_address(struct net_devic
|
||||
@@ -8181,6 +8228,7 @@ int dev_set_mac_address(struct net_devic
|
||||
if (err)
|
||||
return err;
|
||||
dev->addr_assign_type = NET_ADDR_SET;
|
||||
|
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
static int netif_rx_internal(struct sk_buff *skb);
|
||||
static int call_netdevice_notifiers_info(unsigned long val,
|
||||
@@ -5946,6 +5947,11 @@ void __napi_schedule(struct napi_struct
|
||||
@@ -5948,6 +5949,11 @@ void __napi_schedule(struct napi_struct
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
local_irq_save(flags);
|
||||
____napi_schedule(this_cpu_ptr(&softnet_data), n);
|
||||
local_irq_restore(flags);
|
||||
@@ -5997,6 +6003,10 @@ EXPORT_SYMBOL(napi_schedule_prep);
|
||||
@@ -5999,6 +6005,10 @@ EXPORT_SYMBOL(napi_schedule_prep);
|
||||
*/
|
||||
void __napi_schedule_irqoff(struct napi_struct *n)
|
||||
{
|
||||
@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
____napi_schedule(this_cpu_ptr(&softnet_data), n);
|
||||
else
|
||||
@@ -6261,9 +6271,89 @@ static void init_gro_hash(struct napi_st
|
||||
@@ -6263,9 +6273,89 @@ static void init_gro_hash(struct napi_st
|
||||
napi->gro_bitmask = 0;
|
||||
}
|
||||
|
||||
@ -208,7 +208,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
INIT_LIST_HEAD(&napi->poll_list);
|
||||
hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
|
||||
napi->timer.function = napi_watchdog;
|
||||
@@ -6280,6 +6370,7 @@ void netif_napi_add(struct net_device *d
|
||||
@@ -6282,6 +6372,7 @@ void netif_napi_add(struct net_device *d
|
||||
#ifdef CONFIG_NETPOLL
|
||||
napi->poll_owner = -1;
|
||||
#endif
|
||||
@ -216,7 +216,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
set_bit(NAPI_STATE_SCHED, &napi->state);
|
||||
set_bit(NAPI_STATE_NPSVC, &napi->state);
|
||||
list_add_rcu(&napi->dev_list, &dev->napi_list);
|
||||
@@ -6320,6 +6411,7 @@ static void flush_gro_hash(struct napi_s
|
||||
@@ -6322,6 +6413,7 @@ static void flush_gro_hash(struct napi_s
|
||||
void netif_napi_del(struct napi_struct *napi)
|
||||
{
|
||||
might_sleep();
|
||||
@ -224,7 +224,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (napi_hash_del(napi))
|
||||
synchronize_net();
|
||||
list_del_init(&napi->dev_list);
|
||||
@@ -6332,50 +6424,18 @@ EXPORT_SYMBOL(netif_napi_del);
|
||||
@@ -6334,50 +6426,18 @@ EXPORT_SYMBOL(netif_napi_del);
|
||||
|
||||
static int napi_poll(struct napi_struct *n, struct list_head *repoll)
|
||||
{
|
||||
@ -279,7 +279,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
/* Some drivers may have called napi_schedule
|
||||
* prior to exhausting their budget.
|
||||
@@ -10347,6 +10407,10 @@ static int __init net_dev_init(void)
|
||||
@@ -10349,6 +10409,10 @@ static int __init net_dev_init(void)
|
||||
sd->backlog.weight = weight_p;
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
|
||||
|
||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
@@ -6971,6 +6971,7 @@ static int mv88e6xxx_register_switch(str
|
||||
@@ -6973,6 +6973,7 @@ static int mv88e6xxx_register_switch(str
|
||||
ds->ops = &mv88e6xxx_switch_ops;
|
||||
ds->ageing_time_min = chip->info->age_time_coeff;
|
||||
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
||||
|
@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
depends on ARCH_MOXART || COMPILE_TEST
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -50,6 +50,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium
|
||||
@@ -52,6 +52,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium
|
||||
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o
|
||||
obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
|
||||
obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o
|
||||
|
@ -16,7 +16,7 @@
|
||||
config MICREL_KS8995MA
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -69,6 +69,7 @@ ifdef CONFIG_HWMON
|
||||
@@ -71,6 +71,7 @@ ifdef CONFIG_HWMON
|
||||
aquantia-objs += aquantia_hwmon.o
|
||||
endif
|
||||
obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o
|
||||
|
@ -40,7 +40,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
|
||||
---help---
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -103,6 +103,7 @@ obj-$(CONFIG_MICROSEMI_PHY) += mscc.o
|
||||
@@ -105,6 +105,7 @@ obj-$(CONFIG_MICROSEMI_PHY) += mscc.o
|
||||
obj-$(CONFIG_NATIONAL_PHY) += national.o
|
||||
obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
|
||||
obj-$(CONFIG_QSEMI_PHY) += qsemi.o
|
||||
|
@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
depends on ARCH_MOXART || COMPILE_TEST
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -50,6 +50,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium
|
||||
@@ -52,6 +52,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium
|
||||
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o
|
||||
obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
|
||||
obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o
|
||||
|
@ -164,7 +164,7 @@
|
||||
|
||||
--- a/include/net/bonding.h
|
||||
+++ b/include/net/bonding.h
|
||||
@@ -243,6 +243,7 @@ struct bonding {
|
||||
@@ -244,6 +244,7 @@ struct bonding {
|
||||
#endif /* CONFIG_DEBUG_FS */
|
||||
struct rtnl_link_stats64 bond_stats;
|
||||
struct lock_class_key stats_lock_key;
|
||||
@ -172,7 +172,7 @@
|
||||
};
|
||||
|
||||
#define bond_slave_get_rcu(dev) \
|
||||
@@ -757,4 +758,12 @@ static inline void bond_tx_drop(struct n
|
||||
@@ -758,4 +759,12 @@ static inline void bond_tx_drop(struct n
|
||||
dev_kfree_skb_any(skb);
|
||||
}
|
||||
|
||||
@ -614,7 +614,7 @@
|
||||
}
|
||||
|
||||
/* bond_mii_monitor
|
||||
@@ -4399,6 +4461,11 @@ static void bond_destructor(struct net_d
|
||||
@@ -4403,6 +4465,11 @@ static void bond_destructor(struct net_d
|
||||
struct bonding *bond = netdev_priv(bond_dev);
|
||||
if (bond->wq)
|
||||
destroy_workqueue(bond->wq);
|
||||
@ -626,7 +626,7 @@
|
||||
}
|
||||
|
||||
void bond_setup(struct net_device *bond_dev)
|
||||
@@ -4948,6 +5015,16 @@ int bond_create(struct net *net, const c
|
||||
@@ -4954,6 +5021,16 @@ int bond_create(struct net *net, const c
|
||||
bond_work_init_all(bond);
|
||||
|
||||
rtnl_unlock();
|
||||
@ -643,7 +643,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -5043,6 +5120,203 @@ static void __exit bonding_exit(void)
|
||||
@@ -5049,6 +5126,203 @@ static void __exit bonding_exit(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -111,7 +111,7 @@
|
||||
|
||||
--- a/net/ipv6/ip6_gre.c
|
||||
+++ b/net/ipv6/ip6_gre.c
|
||||
@@ -1919,6 +1919,7 @@ static void ip6gre_tap_setup(struct net_
|
||||
@@ -1925,6 +1925,7 @@ static void ip6gre_tap_setup(struct net_
|
||||
|
||||
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
|
||||
dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
|
||||
|
@ -31,7 +31,7 @@
|
||||
config MICREL_KS8995MA
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -99,6 +99,7 @@ obj-$(CONFIG_MICROCHIP_PHY) += microchip
|
||||
@@ -101,6 +101,7 @@ obj-$(CONFIG_MICROCHIP_PHY) += microchip
|
||||
obj-$(CONFIG_MICROCHIP_T1_PHY) += microchip_t1.o
|
||||
obj-$(CONFIG_MICROSEMI_PHY) += mscc.o
|
||||
obj-$(CONFIG_NATIONAL_PHY) += national.o
|
||||
|
@ -15,7 +15,7 @@
|
||||
---help---
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -102,6 +102,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o
|
||||
@@ -104,6 +104,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o
|
||||
obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
|
||||
obj-$(CONFIG_QSEMI_PHY) += qsemi.o
|
||||
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||
|
@ -29,7 +29,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
|
||||
---help---
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -98,6 +98,7 @@ obj-$(CONFIG_MICREL_PHY) += micrel.o
|
||||
@@ -100,6 +100,7 @@ obj-$(CONFIG_MICREL_PHY) += micrel.o
|
||||
obj-$(CONFIG_MICROCHIP_PHY) += microchip.o
|
||||
obj-$(CONFIG_MICROCHIP_T1_PHY) += microchip_t1.o
|
||||
obj-$(CONFIG_MICROSEMI_PHY) += mscc.o
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
|
||||
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
|
||||
@@ -98,7 +98,7 @@
|
||||
@@ -98,7 +98,7 @@ void intel_uc_fw_change_status(struct in
|
||||
fw_def(ALDERLAKE_P, 0, huc_mmp(tgl, 7, 9, 3)) \
|
||||
fw_def(ALDERLAKE_S, 0, huc_raw(tgl)) \
|
||||
fw_def(ALDERLAKE_S, 0, huc_mmp(tgl, 7, 9, 3)) \
|
||||
|
@ -140,7 +140,7 @@ and performance for all other cases.
|
||||
* and hopefully then we'll have sufficient space.
|
||||
--- a/net/ipv4/tcp_ipv4.c
|
||||
+++ b/net/ipv4/tcp_ipv4.c
|
||||
@@ -3215,6 +3215,8 @@ static int __net_init tcp_sk_init(struct
|
||||
@@ -3216,6 +3216,8 @@ static int __net_init tcp_sk_init(struct
|
||||
else
|
||||
net->ipv4.tcp_congestion_control = &tcp_reno;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user