From 52a4c02eba2a5d17ca66ead505b28c0bd88b89e9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 5 Feb 2021 22:49:06 -0800 Subject: Updated to 5.10.13 --- 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch | 52 ---------------------- PKGBUILD | 9 ++-- config | 15 ++++--- 3 files changed, 11 insertions(+), 65 deletions(-) delete mode 100644 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch diff --git a/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch b/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch deleted file mode 100644 index 594302d..0000000 --- a/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 545d6504ef3c786b8294ca2129111227a7bb6515 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Mon, 25 Jan 2021 07:09:49 -0800 -Subject: iwlwifi: provide gso_type to GSO packets - -commit 81a86e1bd8e7060ebba1718b284d54f1238e9bf9 upstream. - -net/core/tso.c got recent support for USO, and this broke iwlfifi -because the driver implemented a limited form of GSO. - -Providing ->gso_type allows for skb_is_gso_tcp() to provide -a correct result. - -Fixes: 3d5b459ba0e3 ("net: tso: add UDP segmentation support") -Signed-off-by: Eric Dumazet -Reported-by: Ben Greear -Tested-by: Ben Greear -Cc: Luca Coelho -Cc: Johannes Berg -Link: https://bugzilla.kernel.org/show_bug.cgi?id=209913 -Link: https://lore.kernel.org/r/20210125150949.619309-1-eric.dumazet@gmail.com -Signed-off-by: Jakub Kicinski -Cc: Robert Hancock -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -index fe1c538cd718..7626117c01fa 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -@@ -833,6 +833,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, - - next = skb_gso_segment(skb, netdev_flags); - skb_shinfo(skb)->gso_size = mss; -+ skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6; - if (WARN_ON_ONCE(IS_ERR(next))) - return -EINVAL; - else if (next) -@@ -855,6 +856,8 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, - - if (tcp_payload_len > mss) { - skb_shinfo(tmp)->gso_size = mss; -+ skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 : -+ SKB_GSO_TCPV6; - } else { - if (qos) { - u8 *qc; --- -cgit v1.2.3-1-gf6bb5 - diff --git a/PKGBUILD b/PKGBUILD index 3ca6a86..3a26069 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ pkgbase=linux-libre _supver=5 _majver=10 -_minver=12 +_minver=13 _gccpatchver='20201113' _gccpatchger='10.1' _gccpatchker='5.8' @@ -43,7 +43,6 @@ source=( config # the main kernel config file 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch - 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch raid6-default-algo.patch @@ -56,14 +55,13 @@ validpgpkeys=( ) b2sums=('86103699a6bc906e85429430df098b0ddb7cfc8c887f98b37f994498388d634554e119eadb1b15f591bdf4f463e7efb7420e3e370af0029b7ed9e988a5f26b01' 'SKIP' - '345b045399eb61886d17f5fc2fc9488648fb17a3528bd6627c3631f06cccaa1dc9e41110c26b479885ddcef282b579ed9c6f5d2f4a3e011ac77cd9de83af1150' + '8e17f212cbe57d35cbd03e96ea6d4f72587673462cbd5f38f6212339b969f6c267755fb13166abed9a43d097ca585c85e846355ad7028dbee14a2a4ed6d4c902' '2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f' 'd8297e09f552a2d6bb24c2ba10481fd2b407057f3b24278e72a89233473460d339c83838791989773623178b5af80588fb4c484da2931f1040e313cce7ceca00' - '9b973fa8d55d9d68020f8d05458edfad2eea916ad0bbefcabf3e41a750aae8d9bb1c1c3820105bb785e050dd7a4343ab55c8bd97ab657520c17d2da3c18b7a99' '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127' 'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' - '0f4f3c9954cedf9c7b8cf6efa536e14254b008d0ed32a5332be4cbc1c2ce09ce2b5161467ae2fa872021e668a3c3d9b9f1f3d46f83331fdc5d9560e99dd43451' + '9e7c50970f815c6c506abf128b720610911d2f924802874e646e1e294e5d80879e5fc02eeb24bb7c4475ac10eb34b99f81dc1b74177bba36c7cd0f5771d0c799' 'SKIP') export KBUILD_BUILD_HOST=arc4linux @@ -87,7 +85,6 @@ prepare() { echo "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch patch -p1 -i ../0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch - patch -p1 -i ../0003-iwlwifi-provide-gso_type-to-GSO-packets.patch # graysky gcc patch diff --git a/config b/config index b4581ef..b406a2d 100644 --- a/config +++ b/config @@ -2944,7 +2944,7 @@ CONFIG_B53_SRAB_DRIVER=m CONFIG_B53_SERDES=m CONFIG_NET_DSA_BCM_SF2=m CONFIG_NET_DSA_LOOP=m -CONFIG_NET_DSA_LANTIQ_GSWIP=m +# CONFIG_NET_DSA_LANTIQ_GSWIP is not set CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m @@ -3339,7 +3339,7 @@ CONFIG_AT803X_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m -CONFIG_ROCKCHIP_PHY=m +# CONFIG_ROCKCHIP_PHY is not set CONFIG_SMSC_PHY=m CONFIG_STE10XP=m CONFIG_TERANETICS_PHY=m @@ -3863,7 +3863,7 @@ CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_MTK_PMIC=m CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_BYD=y CONFIG_MOUSE_PS2_LOGIPS2PP=y @@ -4188,7 +4188,7 @@ CONFIG_SERIAL_UARTLITE_NR_UARTS=1 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_LANTIQ=m +# CONFIG_SERIAL_LANTIQ is not set CONFIG_SERIAL_SCCNXP=m CONFIG_SERIAL_SC16IS7XX_CORE=m CONFIG_SERIAL_SC16IS7XX=m @@ -4428,11 +4428,11 @@ CONFIG_SPI_DLN2=m CONFIG_SPI_NXP_FLEXSPI=m CONFIG_SPI_GPIO=m CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_LANTIQ_SSC=m +# CONFIG_SPI_LANTIQ_SSC is not set CONFIG_SPI_OC_TINY=m CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX_PCI=m -CONFIG_SPI_ROCKCHIP=m +# CONFIG_SPI_ROCKCHIP is not set CONFIG_SPI_SC18IS602=m CONFIG_SPI_SIFIVE=m CONFIG_SPI_MXIC=m @@ -9418,7 +9418,8 @@ CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_LOADPIN=y +CONFIG_SECURITY_LOADPIN_ENFORCE=y CONFIG_SECURITY_YAMA=y CONFIG_SECURITY_SAFESETID=y # CONFIG_SECURITY_LOCKDOWN_LSM is not set -- cgit v1.2.1