projects
/
openwrt
/
staging
/
thess.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
71af55a
)
kernel: bump 5.4 to 5.4.158
author
John Audia
<graysky@archlinux.us>
Sat, 6 Nov 2021 16:34:16 +0000
(12:34 -0400)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 7 Nov 2021 18:58:08 +0000
(19:58 +0100)
All patches automatically rebased.
Signed-off-by: John Audia <graysky@archlinux.us>
18 files changed:
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
patch
|
blob
|
history
target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
patch
|
blob
|
history
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
patch
|
blob
|
history
target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
patch
|
blob
|
history
target/linux/generic/hack-5.4/721-phy_packets.patch
patch
|
blob
|
history
target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
patch
|
blob
|
history
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
patch
|
blob
|
history
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
patch
|
blob
|
history
target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
patch
|
blob
|
history
target/linux/ipq40xx/patches-5.4/0019-v5.6-mtd-spi-nor-Add-support-for-mx25r3235f.patch
patch
|
blob
|
history
target/linux/ipq40xx/patches-5.4/105-ipq40xx-fix-sleep-clock.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
patch
|
blob
|
history
target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch
patch
|
blob
|
history
target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index cb4d19558800e122dfc4bca885ae8caca5c29d46..246fa46542da5593a2925826d478284be9037958 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-6,10
+6,10
@@
ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
-LINUX_VERSION-5.4 = .15
6
+LINUX_VERSION-5.4 = .15
8
LINUX_VERSION-5.10 = .77
LINUX_VERSION-5.10 = .77
-LINUX_KERNEL_HASH-5.4.15
6 = 06fe73e4623fcf1b3c0d0e1983d8286a2ff5b8fffbcb2163f4c01696a1c377fe
+LINUX_KERNEL_HASH-5.4.15
8 = 6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59
LINUX_KERNEL_HASH-5.10.77 = d3b64edfc1dd7212e62ed733aeeb73d64ffd6d9658d322d44cddf1b41d5b8fc3
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
LINUX_KERNEL_HASH-5.10.77 = d3b64edfc1dd7212e62ed733aeeb73d64ffd6d9658d322d44cddf1b41d5b8fc3
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
diff --git
a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
index eeea18bb9c679f4e3161f24412181063f0c64d03..13f0d9d0006230b1eebb01076bf9d059c3beaf6c 100644
(file)
--- a/
target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
+++ b/
target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
@@
-66,7
+66,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -542
3,8 +5423
,7 @@ static inline void skb_gro_reset_offset(
+@@ -542
9,8 +5429
,7 @@ static inline void skb_gro_reset_offset(
NAPI_GRO_CB(skb)->frag0 = NULL;
NAPI_GRO_CB(skb)->frag0_len = 0;
NAPI_GRO_CB(skb)->frag0 = NULL;
NAPI_GRO_CB(skb)->frag0_len = 0;
diff --git
a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
index 11da9540e9f796e535eb0989a5a35d8c3f988158..edfe1517250d5e143a0d9725e2fefb4a91b996ac 100644
(file)
--- a/
target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
+++ b/
target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
@@
-24,7
+24,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
#include <linux/workqueue.h>
#include <linux/mdio.h>
#include <linux/io.h>
#include <linux/workqueue.h>
#include <linux/mdio.h>
#include <linux/io.h>
-@@ -8
43,6 +84
4,9 @@ void phy_stop(struct phy_device *phydev)
+@@ -8
63,6 +86
4,9 @@ void phy_stop(struct phy_device *phydev)
mutex_lock(&phydev->lock);
mutex_lock(&phydev->lock);
@@
-34,7
+34,7
@@
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phydev->state = PHY_HALTED;
mutex_unlock(&phydev->lock);
phydev->state = PHY_HALTED;
mutex_unlock(&phydev->lock);
-@@ -9
05,6 +90
9,9 @@ void phy_state_machine(struct work_struc
+@@ -9
25,6 +92
9,9 @@ void phy_state_machine(struct work_struc
old_state = phydev->state;
old_state = phydev->state;
diff --git
a/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
b/target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
index bf0ff9eddf5d4802de055c0a3a39db5f999195c2..55149150c9b6605c23e7c23fce596acdf0aaa8f7 100644
(file)
--- a/
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
+++ b/
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@
-918,7
+918,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
-@@ -13
50,9 +1350
,7 @@ static int lpc_eth_drv_probe(struct plat
+@@ -13
49,9 +1349
,7 @@ static int lpc_eth_drv_probe(struct plat
__lpc_get_mac(pldat, ndev->dev_addr);
if (!is_valid_ether_addr(ndev->dev_addr)) {
__lpc_get_mac(pldat, ndev->dev_addr);
if (!is_valid_ether_addr(ndev->dev_addr)) {
diff --git
a/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
b/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
index 438588f9f41a2bdaf50a57584922ea4196cf6698..8c18d5df6d5c79bfcf3d02de422d9f8a0133d154 100644
(file)
--- a/
target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
+++ b/
target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
@@
-41,9
+41,9
@@
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
struct scsi_vpd *vpd_pg80 = NULL, *vpd_pg83 = NULL;
+ struct scsi_vpd *vpd_pg0 = NULL, *vpd_pg89 = NULL;
unsigned long flags;
struct scsi_vpd *vpd_pg80 = NULL, *vpd_pg83 = NULL;
+ struct scsi_vpd *vpd_pg0 = NULL, *vpd_pg89 = NULL;
unsigned long flags;
+ struct module *mod;
- sdev = container_of(work, struct scsi_device, ew.work);
-@@ -466,16 +467,24 @@ static void scsi_device_dev_release_user
+@@ -469,16 +470,24 @@ static void scsi_device_dev_release_user
sdev->request_queue = NULL;
mutex_lock(&sdev->inquiry_mutex);
sdev->request_queue = NULL;
mutex_lock(&sdev->inquiry_mutex);
@@
-68,7
+68,7
@@
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
kfree(sdev->inquiry);
kfree(sdev);
kfree(sdev->inquiry);
kfree(sdev);
-@@ -8
74,6 +883
,8 @@ static struct bin_attribute dev_attr_vpd
+@@ -8
83,6 +892
,8 @@ static struct bin_attribute dev_attr_vpd
sdev_vpd_pg_attr(pg83);
sdev_vpd_pg_attr(pg80);
sdev_vpd_pg_attr(pg83);
sdev_vpd_pg_attr(pg80);
@@
-77,7
+77,7
@@
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
struct bin_attribute *bin_attr,
static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
struct bin_attribute *bin_attr,
-@@ -12
06,12 +1217
,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
+@@ -12
15,12 +1226
,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
struct scsi_device *sdev = to_scsi_device(dev);
struct scsi_device *sdev = to_scsi_device(dev);
@@
-96,7
+96,7
@@
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
return S_IRUGO;
}
return S_IRUGO;
}
-@@ -12
54,8 +1271
,10 @@ static struct attribute *scsi_sdev_attrs
+@@ -12
63,8 +1280
,10 @@ static struct attribute *scsi_sdev_attrs
};
static struct bin_attribute *scsi_sdev_bin_attrs[] = {
};
static struct bin_attribute *scsi_sdev_bin_attrs[] = {
diff --git
a/target/linux/generic/hack-5.4/721-phy_packets.patch
b/target/linux/generic/hack-5.4/721-phy_packets.patch
index 836fc54ba2977ebb3c5289fcc6b6976611fe5649..bc9b3a4783d264910541904238b20b3b40c12992 100644
(file)
--- a/
target/linux/generic/hack-5.4/721-phy_packets.patch
+++ b/
target/linux/generic/hack-5.4/721-phy_packets.patch
@@
-101,7
+101,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -319
2,10 +3192
,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -319
8,10 +3198
,20 @@ static int xmit_one(struct sk_buff *skb,
if (dev_nit_active(dev))
dev_queue_xmit_nit(skb, dev);
if (dev_nit_active(dev))
dev_queue_xmit_nit(skb, dev);
diff --git
a/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
b/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index 0b95eee494e61c1c8522a1820c518d6623da7a19..06227cfafe29a67efd435bd76159f38291a84c4c 100644
(file)
--- a/
target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/
target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@
-110,7
+110,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
return -EINVAL;
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
return -EINVAL;
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
-@@ -9
3,6 +93
,8 @@ static int ip6_pkt_discard(struct sk_bu
+@@ -9
4,6 +94
,8 @@ static int ip6_pkt_discard(struct sk_bu
static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
static int ip6_pkt_prohibit(struct sk_buff *skb);
static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);
static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
static int ip6_pkt_prohibit(struct sk_buff *skb);
static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);
@@
-119,7
+119,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static void ip6_link_failure(struct sk_buff *skb);
static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb, u32 mtu,
static void ip6_link_failure(struct sk_buff *skb);
static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb, u32 mtu,
-@@ -32
6,6 +328
,18 @@ static const struct rt6_info ip6_prohibi
+@@ -32
7,6 +329
,18 @@ static const struct rt6_info ip6_prohibi
.rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP),
};
.rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP),
};
@@
-138,7
+138,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = {
.__refcnt = ATOMIC_INIT(1),
static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = {
.__refcnt = ATOMIC_INIT(1),
-@@ -104
7,6 +1061
,7 @@ static const int fib6_prop[RTN_MAX + 1]
+@@ -104
8,6 +1062
,7 @@ static const int fib6_prop[RTN_MAX + 1]
[RTN_BLACKHOLE] = -EINVAL,
[RTN_UNREACHABLE] = -EHOSTUNREACH,
[RTN_PROHIBIT] = -EACCES,
[RTN_BLACKHOLE] = -EINVAL,
[RTN_UNREACHABLE] = -EHOSTUNREACH,
[RTN_PROHIBIT] = -EACCES,
@@
-146,7
+146,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
[RTN_THROW] = -EAGAIN,
[RTN_NAT] = -EINVAL,
[RTN_XRESOLVE] = -EINVAL,
[RTN_THROW] = -EAGAIN,
[RTN_NAT] = -EINVAL,
[RTN_XRESOLVE] = -EINVAL,
-@@ -108
4,6 +1099
,10 @@ static void ip6_rt_init_dst_reject(struc
+@@ -108
5,6 +1100
,10 @@ static void ip6_rt_init_dst_reject(struc
rt->dst.output = ip6_pkt_prohibit_out;
rt->dst.input = ip6_pkt_prohibit;
break;
rt->dst.output = ip6_pkt_prohibit_out;
rt->dst.input = ip6_pkt_prohibit;
break;
@@
-157,7
+157,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
case RTN_THROW:
case RTN_UNREACHABLE:
default:
case RTN_THROW:
case RTN_UNREACHABLE:
default:
-@@ -44
26,6 +4445
,17 @@ static int ip6_pkt_prohibit_out(struct n
+@@ -44
34,6 +4453
,17 @@ static int ip6_pkt_prohibit_out(struct n
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}
@@
-175,7
+175,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
/*
* Allocate a dst for local (unicast / anycast) address.
*/
/*
* Allocate a dst for local (unicast / anycast) address.
*/
-@@ -49
06,7 +4936
,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -49
14,7 +4944
,8 @@ static int rtm_to_fib6_config(struct sk_
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
@@
-185,7
+185,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
-@@ -60
29,6 +6060
,8 @@ static int ip6_route_dev_notify(struct n
+@@ -60
37,6 +6068
,8 @@ static int ip6_route_dev_notify(struct n
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@
-194,7
+194,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
-@@ -604
0,6 +6073
,7 @@ static int ip6_route_dev_notify(struct n
+@@ -604
8,6 +6081
,7 @@ static int ip6_route_dev_notify(struct n
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@
-202,7
+202,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
#endif
}
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
#endif
}
-@@ -62
32,6 +6266
,8 @@ static int __net_init ip6_route_net_init
+@@ -62
40,6 +6274
,8 @@ static int __net_init ip6_route_net_init
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false;
@@
-211,7
+211,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
sizeof(*net->ipv6.ip6_prohibit_entry),
GFP_KERNEL);
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
sizeof(*net->ipv6.ip6_prohibit_entry),
GFP_KERNEL);
-@@ -62
42,11 +6278
,21 @@ static int __net_init ip6_route_net_init
+@@ -62
50,11 +6286
,21 @@ static int __net_init ip6_route_net_init
ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
@@
-234,7
+234,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
-@@ -627
0,6 +6316
,8 @@ out:
+@@ -627
8,6 +6324
,8 @@ out:
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@
-243,7
+243,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
-@@ -62
89,6 +6337
,7 @@ static void __net_exit ip6_route_net_exi
+@@ -62
97,6 +6345
,7 @@ static void __net_exit ip6_route_net_exi
kfree(net->ipv6.ip6_null_entry);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
kfree(net->ipv6.ip6_null_entry);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
@@
-251,7
+251,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
-@@ -63
66,6 +6415
,9 @@ void __init ip6_route_init_special_entri
+@@ -63
74,6 +6423
,9 @@ void __init ip6_route_init_special_entri
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
diff --git
a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 4839ac5e70e5e26c5df97ac05e634003efb1e2d7..e0540866c6be8aa32dc39e98ade67a04bd755171 100644
(file)
--- a/
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@
-32,7
+32,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -54
89,6 +5489
,9 @@ static enum gro_result dev_gro_receive(s
+@@ -54
95,6 +5495
,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;
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;
if (netif_elide_gro(skb->dev))
goto normal;
-@@ -729
1,6 +7294
,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -729
7,6 +7300
,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
&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,
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
-@@ -734
1,6 +7386
,7 @@ static int __netdev_upper_dev_link(struc
+@@ -734
7,6 +7392
,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
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);
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
-@@ -74
34,6 +7480
,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -74
40,6 +7486
,7 @@ void netdev_upper_dev_unlink(struct net_
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
__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);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
-@@ -81
64,6 +8211
,7 @@ int dev_set_mac_address(struct net_devic
+@@ -81
70,6 +8217
,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
diff --git
a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
index 7c9726b8250925f2dbe0573837d73f42785b1d6f..bdddd062eb117d02d3680d61e00850e4cbc0a14c 100644
(file)
--- a/
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
@@
-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,
static int netif_rx_internal(struct sk_buff *skb);
static int call_netdevice_notifiers_info(unsigned long val,
-@@ -593
1,6 +5932
,11 @@ void __napi_schedule(struct napi_struct
+@@ -593
7,6 +5938
,11 @@ void __napi_schedule(struct napi_struct
{
unsigned long flags;
{
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);
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
-@@ -598
2,6 +5988
,10 @@ EXPORT_SYMBOL(napi_schedule_prep);
+@@ -598
8,6 +5994
,10 @@ EXPORT_SYMBOL(napi_schedule_prep);
*/
void __napi_schedule_irqoff(struct napi_struct *n)
{
*/
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
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
____napi_schedule(this_cpu_ptr(&softnet_data), n);
else
-@@ -62
46,9 +6256
,89 @@ static void init_gro_hash(struct napi_st
+@@ -62
52,9 +6262
,89 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}
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;
INIT_LIST_HEAD(&napi->poll_list);
hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
napi->timer.function = napi_watchdog;
-@@ -62
65,6 +6355
,7 @@ void netif_napi_add(struct net_device *d
+@@ -62
71,6 +6361
,7 @@ void netif_napi_add(struct net_device *d
#ifdef CONFIG_NETPOLL
napi->poll_owner = -1;
#endif
#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);
set_bit(NAPI_STATE_SCHED, &napi->state);
set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list);
-@@ -63
05,6 +6396
,7 @@ static void flush_gro_hash(struct napi_s
+@@ -63
11,6 +6402
,7 @@ static void flush_gro_hash(struct napi_s
void netif_napi_del(struct napi_struct *napi)
{
might_sleep();
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);
if (napi_hash_del(napi))
synchronize_net();
list_del_init(&napi->dev_list);
-@@ -63
17,50 +6409
,18 @@ EXPORT_SYMBOL(netif_napi_del);
+@@ -63
23,50 +6415
,18 @@ EXPORT_SYMBOL(netif_napi_del);
static int napi_poll(struct napi_struct *n, struct list_head *repoll)
{
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.
/* Some drivers may have called napi_schedule
* prior to exhausting their budget.
-@@ -1034
0,6 +10400
,10 @@ static int __init net_dev_init(void)
+@@ -1034
6,6 +10406
,10 @@ static int __init net_dev_init(void)
sd->backlog.weight = weight_p;
}
sd->backlog.weight = weight_p;
}
diff --git
a/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
b/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
index 86f8a416e9ee6b4049ded8e696ecf7db00ee8a4e..6e4584c8a1433dc94704e8da27323aac18948a95 100644
(file)
--- a/
target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
+++ b/
target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
@@
-98,7
+98,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* __LINUX_USB_PCI_QUIRKS_H */
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
#endif /* __LINUX_USB_PCI_QUIRKS_H */
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
-@@ -48
5,7 +485
,14 @@ extern int usb_hcd_pci_probe(struct pci_
+@@ -48
3,7 +483
,14 @@ extern int usb_hcd_pci_probe(struct pci_
extern void usb_hcd_pci_remove(struct pci_dev *dev);
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
extern void usb_hcd_pci_remove(struct pci_dev *dev);
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
diff --git
a/target/linux/ipq40xx/patches-5.4/0019-v5.6-mtd-spi-nor-Add-support-for-mx25r3235f.patch
b/target/linux/ipq40xx/patches-5.4/0019-v5.6-mtd-spi-nor-Add-support-for-mx25r3235f.patch
index f1be01c8e1438316b37d708d7abc82f15ba34a64..720247861081e7529edf445d042d87557c68c120 100644
(file)
--- a/
target/linux/ipq40xx/patches-5.4/0019-v5.6-mtd-spi-nor-Add-support-for-mx25r3235f.patch
+++ b/
target/linux/ipq40xx/patches-5.4/0019-v5.6-mtd-spi-nor-Add-support-for-mx25r3235f.patch
@@
-18,7
+18,7
@@
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -235
3,6 +2353
,8 @@ static const struct flash_info spi_nor_i
+@@ -235
4,6 +2354
,8 @@ static const struct flash_info spi_nor_i
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
diff --git
a/target/linux/ipq40xx/patches-5.4/105-ipq40xx-fix-sleep-clock.patch
b/target/linux/ipq40xx/patches-5.4/105-ipq40xx-fix-sleep-clock.patch
index 97a36872e96310cd17779bfeef9ad737a41ca616..8afcbdcf9881ba8eb1064979c56d52f422ef89b3 100644
(file)
--- a/
target/linux/ipq40xx/patches-5.4/105-ipq40xx-fix-sleep-clock.patch
+++ b/
target/linux/ipq40xx/patches-5.4/105-ipq40xx-fix-sleep-clock.patch
@@
-15,7
+15,7
@@
Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -14
1,9 +141
,9 @@
+@@ -14
0,9 +140
,9 @@
};
clocks {
};
clocks {
diff --git
a/target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
b/target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
index 9c83b4c7f72e20122b6bbeec5976075f8762cf0c..8488bbaf50586ab1cb81f79a20fd5cd0b764530e 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
+++ b/
target/linux/layerscape/patches-5.4/817-spi-0006-LF-20-2-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
@@
-11,7
+11,7
@@
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -24
19,7 +2419
,7 @@ static const struct flash_info spi_nor_i
+@@ -24
20,7 +2420
,7 @@ static const struct flash_info spi_nor_i
{ "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256,
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_HAS_LOCK | USE_CLSR) },
{ "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256,
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_HAS_LOCK | USE_CLSR) },
diff --git
a/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
b/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
index 3c05330b1a2ef1095ba1425369d04ef7dcca4b1a..d43626577b87133a24b845f9f9de8d98b5c47925 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
+++ b/
target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
@@
-335,7
+335,7
@@
Signed-off-by: Peter Chen <peter.chen@nxp.com>
int is_setup
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
int is_setup
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
-@@ -4
11,7 +411
,10 @@ struct hc_driver {
+@@ -4
09,7 +409
,10 @@ struct hc_driver {
int (*find_raw_port_number)(struct usb_hcd *, int);
/* Call for power on/off the port if necessary */
int (*port_power)(struct usb_hcd *hcd, int portnum, bool enable);
int (*find_raw_port_number)(struct usb_hcd *, int);
/* Call for power on/off the port if necessary */
int (*port_power)(struct usb_hcd *hcd, int portnum, bool enable);
@@
-347,7
+347,7
@@
Signed-off-by: Peter Chen <peter.chen@nxp.com>
};
static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
};
static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
-@@ -47
6,6 +479
,14 @@ int usb_hcd_setup_local_mem(struct usb_h
+@@ -47
4,6 +477
,14 @@ int usb_hcd_setup_local_mem(struct usb_h
struct platform_device;
extern void usb_hcd_platform_shutdown(struct platform_device *dev);
struct platform_device;
extern void usb_hcd_platform_shutdown(struct platform_device *dev);
diff --git
a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
index 6af2f4b95e4934fba15f378fd5992d8690d094e2..361328cf059a86d1678ee9fd00420a4eacb780e7 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
+++ b/
target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
@@
-174,7
+174,7
@@
Signed-off-by: Peter Chen <peter.chen@nxp.com>
* bursts that are required to move all packets in this TD. Only SuperSpeed
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
* bursts that are required to move all packets in this TD. Only SuperSpeed
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -53
90,6 +5390
,7 @@ static const struct hc_driver xhci_hc_dr
+@@ -53
89,6 +5389
,7 @@ static const struct hc_driver xhci_hc_dr
.disable_usb3_lpm_timeout = xhci_disable_usb3_lpm_timeout,
.find_raw_port_number = xhci_find_raw_port_number,
.clear_tt_buffer_complete = xhci_clear_tt_buffer_complete,
.disable_usb3_lpm_timeout = xhci_disable_usb3_lpm_timeout,
.find_raw_port_number = xhci_find_raw_port_number,
.clear_tt_buffer_complete = xhci_clear_tt_buffer_complete,
diff --git
a/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
b/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
index 671397700f53589110af813458aae5d0601c9254..f808b5b556f94e006d7255ed370d606aaf73f4f5 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
+++ b/
target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
@@
-24,7
+24,7
@@
Signed-off-by: Peter Chen <peter.chen@nxp.com>
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
-@@ -541
1,6 +5411
,8 @@ void xhci_init_driver(struct hc_driver *
+@@ -541
0,6 +5410
,8 @@ void xhci_init_driver(struct hc_driver *
drv->check_bandwidth = over->check_bandwidth;
if (over->reset_bandwidth)
drv->reset_bandwidth = over->reset_bandwidth;
drv->check_bandwidth = over->check_bandwidth;
if (over->reset_bandwidth)
drv->reset_bandwidth = over->reset_bandwidth;
diff --git
a/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch
b/target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch
index 3fbb0bf3234bd715ac5429520d10f4c36118824d..d5de4e45bccd468b027b5bc662833c74423b8920 100644
(file)
--- a/
target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch
+++ b/
target/linux/ramips/patches-5.4/302-spi-nor-add-gd25q512.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -230
5,6 +2305
,11 @@ static const struct flash_info spi_nor_i
+@@ -230
6,6 +2306
,11 @@ static const struct flash_info spi_nor_i
SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
.fixups = &gd25q256_fixups,
},
SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
.fixups = &gd25q256_fixups,
},
diff --git
a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
index ae1293c951daeab5a2c3893938d98eaa3ac643c8..8b95eacab11aa7549732f16c6f991d0f6b42b87c 100644
(file)
--- a/
target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
+++ b/
target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
@@
-11,7
+11,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -54
7,7 +547
,10 @@ static int phy_check_link_status(struct
+@@ -54
9,7 +549
,10 @@ static int phy_check_link_status(struct
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
phydev->state = PHY_NOLINK;
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
phydev->state = PHY_NOLINK;
@@
-23,7
+23,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
}
return 0;
}
return 0;
-@@ -9
27,7 +93
0,10 @@ void phy_state_machine(struct work_struc
+@@ -9
47,7 +95
0,10 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;