aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-10-17 07:53:44 -0400
committerDavid Bauer <mail@david-bauer.net>2020-10-20 03:01:27 +0200
commitdd20ba98e701bdb519868588c63ec46e62fb768e (patch)
tree681aea358b196cda60e59f0b05e733edc86626f4 /target
parent33b76d66d1afa9d888f32587b18d78a930593ca5 (diff)
downloadupstream-dd20ba98e701bdb519868588c63ec46e62fb768e.tar.gz
upstream-dd20ba98e701bdb519868588c63ec46e62fb768e.tar.bz2
upstream-dd20ba98e701bdb519868588c63ec46e62fb768e.zip
kernel: bump 5.4 to 5.4.72
All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0199-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch4
-rw-r--r--target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch10
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0199-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch b/target/linux/bcm27xx/patches-5.4/950-0199-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch
index a03c7377f2..0de55097c5 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0199-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0199-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch
@@ -21,8 +21,8 @@ Cc: stable@vger.kernel.org
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
-@@ -1285,8 +1285,13 @@ int hci_conn_check_link_mode(struct hci_
- return 0;
+@@ -1302,8 +1302,13 @@ int hci_conn_check_link_mode(struct hci_
+ return 0;
}
- if (hci_conn_ssp_enabled(conn) &&
diff --git a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch
index 6473dc19c3..45d7999e31 100644
--- a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch
+++ b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch
@@ -199,10 +199,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
+ * @duplex: link duplex
+ * @tx_pause: link transmit pause enablement status
+ * @rx_pause: link receive pause enablement status
- *
-- * If @mode is not an in-band negotiation mode (as defined by
-- * phylink_autoneg_inband()), allow the link to come up. If @phy
-- * is non-%NULL, configure Energy Efficient Ethernet by calling
++ *
+ * Configure the MAC for an established link.
+ *
+ * @speed, @duplex, @tx_pause and @rx_pause indicate the finalised link
@@ -214,7 +211,10 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
+ * Note that when 802.3z in-band negotiation is in use, it is possible
+ * that the user wishes to override the pause settings, and this should
+ * be allowed when considering the implementation of this method.
-+ *
+ *
+- * If @mode is not an in-band negotiation mode (as defined by
+- * phylink_autoneg_inband()), allow the link to come up. If @phy
+- * is non-%NULL, configure Energy Efficient Ethernet by calling
+ * If in-band negotiation mode is disabled, allow the link to come up. If
+ * @phy is non-%NULL, configure Energy Efficient Ethernet by calling
* phy_init_eee() and perform appropriate MAC configuration for EEE.