0c64abbd46
That specific patchset breaks packaging on Ubuntu. https://github.com/Frogging-Family/linux-tkg/pull/26 Also temporarily add Alessio Bonfiglio's patch to restore Killer Wireless-AC 1550i support on 5.7. https://bugzilla.kernel.org/show_bug.cgi?id=208141#c21
80 lines
2.9 KiB
Diff
80 lines
2.9 KiB
Diff
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
|
index 0840d27381ea..73aba9a31064 100644
|
|
--- a/drivers/tty/Kconfig
|
|
+++ b/drivers/tty/Kconfig
|
|
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
|
def_bool y
|
|
depends on VT_CONSOLE && PM_SLEEP
|
|
|
|
+config NR_TTY_DEVICES
|
|
+ int "Maximum tty device number"
|
|
+ depends on VT
|
|
+ range 12 63
|
|
+ default 63
|
|
+ ---help---
|
|
+ This option is used to change the number of tty devices in /dev.
|
|
+ The default value is 63. The lowest number you can set is 12,
|
|
+ 63 is also the upper limit so we don't overrun the serial
|
|
+ consoles.
|
|
+
|
|
+ If unsure, say 63.
|
|
+
|
|
config HW_CONSOLE
|
|
bool
|
|
depends on VT && !UML
|
|
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
|
index e9d39c48520a..3bceead8da40 100644
|
|
--- a/include/uapi/linux/vt.h
|
|
+++ b/include/uapi/linux/vt.h
|
|
@@ -3,12 +3,25 @@
|
|
#define _UAPI_LINUX_VT_H
|
|
|
|
|
|
+/*
|
|
+ * We will make this definition solely for the purpose of making packages
|
|
+ * such as splashutils build, because they can not understand that
|
|
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
|
+ */
|
|
+#ifndef CONFIG_NR_TTY_DEVICES
|
|
+#define CONFIG_NR_TTY_DEVICES 63
|
|
+#endif
|
|
+
|
|
/*
|
|
* These constants are also useful for user-level apps (e.g., VC
|
|
* resizing).
|
|
*/
|
|
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
|
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
|
+/*
|
|
+ * NR_TTY_DEVICES:
|
|
+ * Value MUST be at least 12 and must never be higher then 63
|
|
+ */
|
|
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
|
/* Note: the ioctl VT_GETSTATE does not work for
|
|
consoles 16 and higher (since it returns a short) */
|
|
|
|
From ef8ff025f1f49cfe2b53d9a636f10cdb87ed0f7e Mon Sep 17 00:00:00 2001
|
|
From: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>
|
|
Date: Wed, 1 Jul 2020 20:32:42 +0200
|
|
Subject: [PATCH] Restore "Killer Wireless-AC 1550i" card support
|
|
|
|
In a previous unknown commit the support for the card "Killer(R) Wireless-AC 1550i Wireless Network Adapter(9560NGW)" has been broken: this fix add back missing IDs used by the card in order to make the iwlwifi driver load again the right firmware.
|
|
---
|
|
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
|
|
index 65d65c6baf4c..bac87cfb752f 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
|
|
@@ -582,6 +582,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
|
|
IWL_DEV_INFO(0x30DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
|
|
IWL_DEV_INFO(0x31DC, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),
|
|
IWL_DEV_INFO(0x31DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
|
|
+ IWL_DEV_INFO(0xA370, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
|
|
|
|
IWL_DEV_INFO(0x271C, 0x0214, iwl9260_2ac_cfg, iwl9260_1_name),
|
|
|
|
--
|
|
2.27.0
|