{"id":805680,"url":"http://patchwork.ozlabs.org/api/1.2/patches/805680/?format=json","web_url":"http://patchwork.ozlabs.org/project/lede/patch/20170824214034.9309-2-hauke@hauke-m.de/","project":{"id":54,"url":"http://patchwork.ozlabs.org/api/1.2/projects/54/?format=json","name":"LEDE development","link_name":"lede","list_id":"lede-dev.lists.infradead.org","list_email":"lede-dev@lists.infradead.org","web_url":"http://lede-project.org/","scm_url":"","webscm_url":"http://git.lede-project.org/","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170824214034.9309-2-hauke@hauke-m.de>","list_archive_url":null,"date":"2017-08-24T21:40:31","name":"[LEDE-DEV,RFC,1/4] mac80211: update to backports-4.13-rc6","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"52ecde0d5abff127067daaaec71c73861a9c9a17","submitter":{"id":3794,"url":"http://patchwork.ozlabs.org/api/1.2/people/3794/?format=json","name":"Hauke Mehrtens","email":"hauke@hauke-m.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/lede/patch/20170824214034.9309-2-hauke@hauke-m.de/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805680/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805680/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"pNmjZCNe\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xdd804hpHz9sRV\n\tfor ;\n\tFri, 25 Aug 2017 07:43:12 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dkztv-0007tC-1B; Thu, 24 Aug 2017 21:42:55 +0000","from mx1.mailbox.org ([80.241.60.212])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dkzsR-0006mO-Mk\n\tfor lede-dev@lists.infradead.org; Thu, 24 Aug 2017 21:41:55 +0000","from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby mx1.mailbox.org (Postfix) with ESMTPS id 003B3428CB;\n\tThu, 24 Aug 2017 23:41:06 +0200 (CEST)","from smtp1.mailbox.org ([80.241.60.240])\n\tby spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de\n\t[80.241.56.117]) (amavisd-new, port 10030)\n\twith ESMTP id Fn56PdPMzXW0; Thu, 24 Aug 2017 23:40:46 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References:\n\tIn-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=uEqIVdNbgfcwTWk+cXZb5PSwOLJrofmLeovB5oIr9kM=;\n\tb=pNmjZCNe/iqTzy\n\tOSj9iNS1ODgD+C/I9dzmj1o/fGuoAds784H+3YCCqeTjCNJT6w6H1a8CtM5NNGzXCH1WmVLCXFfBy\n\tNJtEKc4v93FGCO4ESoAnGLlZw2RKZvUTGdwG63OJoFHXPq6v39y2oXvyRIVV/bgatCNmTRZeEypZ6\n\trGX+pPFSECIA7re5RdZQm+d/sy8I7mehedbh73yIy0sJINPSZ3JaXg9Dpu4RQvsBrjzo6jpR+rJOG\n\tiyeYFNlb9LobqG9IHoQKcGjXn4Ud2DSEUvOE4pmGDJINFHe/8Pe9R4xElmw3bGTIaGNveIGghpKEM\n\t/1XfAebWFxay40ZE8iAQ==;","X-Virus-Scanned":"amavisd-new at heinlein-support.de","From":"Hauke Mehrtens ","To":"nbd@nbd.name,\n\tlede-dev@lists.infradead.org","Date":"Thu, 24 Aug 2017 23:40:31 +0200","Message-Id":"<20170824214034.9309-2-hauke@hauke-m.de>","In-Reply-To":"<20170824214034.9309-1-hauke@hauke-m.de>","References":"<20170824214034.9309-1-hauke@hauke-m.de>","MIME-Version":"1.0","X-Bad-Reply":"References and In-Reply-To but no 'Re:' in Subject.","X-Spam-Note":"CRM114 run bypassed due to message size (394239 bytes)","X-Spam-Score":"-2.6 (--)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-2.6 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/,\n\tlow trust [80.241.60.212 listed in list.dnswl.org]\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","Subject":"[LEDE-DEV] [RFC 1/4] mac80211: update to backports-4.13-rc6","X-BeenThere":"lede-dev@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Hauke Mehrtens ","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Sender":"\"Lede-dev\" ","Errors-To":"lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"This updates mac80211 to backprots-4.13-rc6.\nThis was only compile tested and runtime tested with ath9k and ath10k.\n\nTo create the backports-4.13-rc6.tar.xz use this repository:\nhttps://github.com/hauke/backports/tree/backports-4.13\nThen run this:\n./gentree.py --git-revision v4.13-rc6 --clean /home/hauke/linux/linux-next-clean/ ../backports-4.13-rc6\n\nSigned-off-by: Hauke Mehrtens \n---\n package/kernel/mac80211/Makefile | 20 +-\n .../kernel/mac80211/patches/001-fix_build.patch | 10 +-\n .../mac80211/patches/002-change_allconfig.patch | 6 +-\n .../patches/004-kconfig_backport_fix.patch | 2 +-\n .../mac80211/patches/005-revert-devcoredump.patch | 143 +-\n .../patches/006-revert-ktime-changes.patch | 20 -\n .../patches/007-revert-genetlink-changes.patch | 266 ---\n .../patches/008-revert-ndo_stats64-cleanup.patch | 20 -\n .../mac80211/patches/009-revert-mtu-changes.patch | 338 ----\n .../mac80211/patches/010-disable_rfkill.patch | 2 +-\n .../mac80211/patches/011-backport_strscpy.patch | 43 -\n .../kernel/mac80211/patches/015-ipw200-mtu.patch | 34 +\n ...d-introducing-a-USB-dependency-in-the-rt2.patch | 78 -\n ...2-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch | 56 -\n ...20-03-rt2x00usb-fix-anchor-initialization.patch | 70 -\n .../020-04-rt61pci-use-entry-directly.patch | 23 -\n ...-call-entry-directly-in-rt2x00_dump_frame.patch | 158 --\n ...06-rt2x00-remove-queue_entry-from-skbdesc.patch | 52 -\n ...sb-don-t-mark-register-accesses-as-inline.patch | 79 -\n ...00lib-move-rt2800_drv_data-declaration-in.patch | 87 -\n ...800-identify-station-based-on-status-WCID.patch | 85 -\n ...rte-filling-tx-status-from-rt2x00lib_txdo.patch | 173 --\n ...arte-clearing-entry-from-rt2x00lib_txdone.patch | 83 -\n ...020-12-rt2x00-add-txdone-nomatch-function.patch | 85 -\n ...x00-fixup-fill_tx_status-for-nomatch-case.patch | 47 -\n ...14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch | 180 --\n ...-status-based-rate-flags-for-nomatch-case.patch | 81 -\n ...-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch | 38 -\n ...rt2x00-fix-rt2x00debug_dump_frame-comment.patch | 23 -\n ...2x00-fix-TX_PWR_CFG_4-register-definition.patch | 32 -\n .../020-19-rt2x00-add-support-for-MT7620.patch | 2064 --------------------\n ...reverse-external-PA-capability-flag-logic.patch | 121 --\n ...rt2800-fix-LNA-gain-assignment-for-MT7620.patch | 49 -\n ...-do-VCO-calibration-after-programming-ALC.patch | 29 -\n ...2800-fix-mt7620-vco-calibration-registers.patch | 45 -\n ...24-rt2800-fix-mt7620-E2-channel-registers.patch | 36 -\n .../mac80211/patches/060-no_local_ssb_bcma.patch | 22 +-\n .../patches/080-ath10k_thermal_config.patch | 2 +-\n .../kernel/mac80211/patches/090-remove-cred.patch | 15 -\n .../100-remove-cryptoapi-dependencies.patch | 23 +-\n .../110-mac80211_keep_keys_on_stop_ap.patch | 2 +-\n .../patches/130-mac80211-hwsim-hrtimer-clock.patch | 11 -\n .../patches/150-disable_addr_notifier.patch | 10 +-\n package/kernel/mac80211/patches/210-ap_scan.patch | 2 +-\n ...04-ath9k-force-rx_clear-when-disabling-rx.patch | 2 +-\n ...mit-retries-for-powersave-response-frames.patch | 12 +-\n ...k-interpret-requested-txpower-in-EIRP-dom.patch | 4 +-\n ...-mac80211-add-hdrlen-to-ieee80211_tx_data.patch | 30 +-\n ...8-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch | 32 +-\n ...nstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch | 2 +-\n ...moredata-bit-in-PS-buffered-frame-release.patch | 6 +-\n ...-potentially-stale-EOSP-status-bit-in-int.patch | 2 +-\n ...th9k-fix-block-ack-window-tracking-issues.patch | 6 +-\n ...-rename-tx_complete_work-to-hw_check_work.patch | 175 --\n ...9k_hw-check-if-the-chip-failed-to-wake-up.patch | 30 -\n ...race-condition-in-enabling-disabling-IRQs.patch | 197 --\n ...eck-brcmf_bus_get_memdump-result-for-erro.patch | 52 -\n ...be-more-verbose-when-PSM-s-watchdog-fires.patch | 38 -\n ...e-wiphy_read_of_freq_limits-to-respect-li.patch | 44 -\n ...mfmac-merge-two-brcmf_err-macros-into-one.patch | 43 -\n ...itch-to-C-function-__brcmf_err-for-printi.patch | 69 -\n ...fmac-merge-two-remaining-brcmf_err-macros.patch | 46 -\n ...h9k-clean-up-and-fix-ath_tx_count_airtime.patch | 107 -\n .../321-mac80211-fix-CSA-in-IBSS-mode.patch | 34 -\n ...n-t-handle-filtered-frames-within-a-BA-se.patch | 28 -\n ...e-net_device_stats-from-struct-net_device.patch | 112 --\n ...ways-print-error-when-PSM-s-watchdog-fire.patch | 148 --\n ...-not-print-the-firmware-version-as-an-err.patch | 56 -\n ...mac-Do-not-complain-about-country-code-00.patch | 28 -\n ...ndle-status-BRCMF_E_STATUS_ABORT-in-cfg80.patch | 35 -\n ...fmac-move-brcmf_txflowblock-to-bcdc-layer.patch | 137 --\n ...mfmac-move-brcmf_txcomplete-to-bcdc-layer.patch | 122 --\n ...ap-brcmf_fws_add_interface-into-bcdc-laye.patch | 95 -\n ...ap-brcmf_fws_del_interface-into-bcdc-laye.patch | 83 -\n ...ap-brcmf_fws_reset_interface-into-bcdc-la.patch | 82 -\n ...conditionally-start-new-netdev-queues-wit.patch | 29 -\n .../patches/326-ath9k-fix-ar934x-OTP-offsets.patch | 42 -\n .../patches/327-ath10k-increase-BMI-timeout.patch | 31 -\n ...28-ath10k-log-when-longer-bmi-cmds-happen.patch | 74 -\n ...BMI-parameters-to-fix-calibration-from-DT.patch | 80 -\n .../mac80211/patches/402-ath_regd_optional.patch | 18 +-\n .../mac80211/patches/404-regd_no_assoc_hints.patch | 4 +-\n .../patches/406-ath_relax_default_regd.patch | 2 +-\n .../patches/440-ath5k_channel_bw_debugfs.patch | 2 +-\n .../patches/500-ath9k_eeprom_debugfs.patch | 4 +-\n .../mac80211/patches/501-ath9k_ahb_init.patch | 2 +-\n .../patches/512-ath9k_channelbw_debugfs.patch | 10 +-\n .../mac80211/patches/513-ath9k_add_pci_ids.patch | 2 +-\n .../522-mac80211_configure_antenna_gain.patch | 38 +-\n .../mac80211/patches/530-ath9k_extra_leds.patch | 6 +-\n .../mac80211/patches/542-ath9k_debugfs_diag.patch | 10 +-\n .../patches/543-ath9k_entropy_from_adc.patch | 10 +-\n .../patches/551-ath9k_ubnt_uap_plus_hsr.patch | 6 +-\n ...t2x00-rt2800lib-enable-support-for-RT3883.patch | 2 +-\n ...3-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch | 6 +-\n ...2800lib-enable-VCO-calibration-for-RF3853.patch | 4 +-\n ...00lib-add-channel-configuration-function-.patch | 22 +-\n ...06-rt2x00-rt2800lib-enable-RF3853-support.patch | 2 +-\n ...00lib-add-MAC-register-initialization-for.patch | 6 +-\n ...00lib-add-BBP-register-initialization-for.patch | 4 +-\n ...00lib-add-RFCSR-initialization-for-RT3883.patch | 16 +-\n ...00lib-use-the-extended-EEPROM-map-for-RT3.patch | 2 +-\n ...2800lib-force-rf-type-to-RF3853-on-RT3883.patch | 4 +-\n ...00lib-add-channel-configuration-code-for-.patch | 12 +-\n ...00lib-fix-txpower_to_dev-function-for-RT3.patch | 2 +-\n ...00lib-use-correct-txpower-calculation-fun.patch | 2 +-\n ...00lib-hardcode-txmixer-gain-values-to-zer.patch | 8 +-\n ...800lib-use-correct-RT-XWI-size-for-RT3883.patch | 2 +-\n ...00lib-fix-antenna-configuration-for-RT388.patch | 2 +-\n ...00lib-fix-LNA-gain-configuration-for-RT38.patch | 10 +-\n ...rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch | 6 +-\n ...00lib-fix-EEPROM-LNA-validation-for-RT388.patch | 12 +-\n ...00lib-fix-txpower-compensation-for-RT3883.patch | 2 +-\n ...00mmio-add-a-workaround-for-spurious-TX_F.patch | 8 +-\n .../602-rt2x00-introduce-rt2x00eeprom.patch | 16 +-\n ...low_disabling_bands_through_platform_data.patch | 2 +-\n .../607-rt2x00-add_platform_data_mac_addr.patch | 2 +-\n ...-rt2x00-allow_disabling_bands_through_dts.patch | 2 +-\n .../610-rt2x00-change-led-polarity-from-OF.patch | 2 +-\n .../patches/611-rt2x00-add-AP+STA-support.patch | 2 +-\n ...x00-add-support-for-external-PA-on-MT7620.patch | 16 +-\n .../651-rt2x00-remove-unneccesary-code.patch | 2 +-\n ...Add-initial-code-to-detect-8188eu-devices.patch | 2 +-\n ...tl8xxxu-Add-rtl8188etv-to-USB-device-list.patch | 2 +-\n ...xxu-Add-sitecom-dongle-to-USB-device-list.patch | 2 +-\n ...d-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch | 2 +-\n .../801-libertas-configure-sysfs-links.patch | 6 +-\n .../802-libertas-set-wireless-macaddr.patch | 2 +-\n .../patches/810-b43-gpio-mask-module-option.patch | 6 +-\n .../kernel/mac80211/patches/811-b43_no_pio.patch | 2 +-\n .../patches/812-b43-add-antenna-control.patch | 18 +-\n .../814-b43-only-use-gpio-0-1-for-led.patch | 2 +-\n .../815-b43-always-take-overlapping-devs.patch | 2 +-\n ...mfmac-register-wiphy-s-during-module_init.patch | 27 +-\n ...rkaround-bug-with-some-inconsistent-BSSes.patch | 4 +-\n .../862-brcmfmac-Disable-power-management.patch | 2 +-\n ...ctivate-user-space-firmware-loading-again.patch | 35 +\n .../921-ath10k_init_devices_synchronously.patch | 2 +-\n .../patches/930-ath10k_add_tpt_led_trigger.patch | 8 +-\n .../936-ath10k-fix-otp-failure-result.patch | 2 +-\n .../940-mwl8k_init_devices_synchronously.patch | 4 +-\n .../960-0010-ath10k-limit-htt-rx-ring-size.patch | 2 +-\n 142 files changed, 359 insertions(+), 6943 deletions(-)\n delete mode 100644 package/kernel/mac80211/patches/006-revert-ktime-changes.patch\n delete mode 100644 package/kernel/mac80211/patches/007-revert-genetlink-changes.patch\n delete mode 100644 package/kernel/mac80211/patches/008-revert-ndo_stats64-cleanup.patch\n delete mode 100644 package/kernel/mac80211/patches/009-revert-mtu-changes.patch\n delete mode 100644 package/kernel/mac80211/patches/011-backport_strscpy.patch\n create mode 100644 package/kernel/mac80211/patches/015-ipw200-mtu.patch\n delete mode 100644 package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch\n delete mode 100644 package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch\n delete mode 100644 package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch\n delete mode 100644 package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch\n delete mode 100644 package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch\n delete mode 100644 package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch\n delete mode 100644 package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch\n delete mode 100644 package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch\n delete mode 100644 package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch\n delete mode 100644 package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch\n delete mode 100644 package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch\n delete mode 100644 package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch\n delete mode 100644 package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch\n delete mode 100644 package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch\n delete mode 100644 package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch\n delete mode 100644 package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch\n delete mode 100644 package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch\n delete mode 100644 package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch\n delete mode 100644 package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch\n delete mode 100644 package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch\n delete mode 100644 package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch\n delete mode 100644 package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch\n delete mode 100644 package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch\n delete mode 100644 package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch\n delete mode 100644 package/kernel/mac80211/patches/090-remove-cred.patch\n delete mode 100644 package/kernel/mac80211/patches/130-mac80211-hwsim-hrtimer-clock.patch\n delete mode 100644 package/kernel/mac80211/patches/314-ath9k-rename-tx_complete_work-to-hw_check_work.patch\n delete mode 100644 package/kernel/mac80211/patches/315-ath9k_hw-check-if-the-chip-failed-to-wake-up.patch\n delete mode 100644 package/kernel/mac80211/patches/316-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch\n delete mode 100644 package/kernel/mac80211/patches/318-0001-brcmfmac-check-brcmf_bus_get_memdump-result-for-erro.patch\n delete mode 100644 package/kernel/mac80211/patches/319-0002-brcmfmac-be-more-verbose-when-PSM-s-watchdog-fires.patch\n delete mode 100644 package/kernel/mac80211/patches/319-0003-brcmfmac-use-wiphy_read_of_freq_limits-to-respect-li.patch\n delete mode 100644 package/kernel/mac80211/patches/319-0004-brcmfmac-merge-two-brcmf_err-macros-into-one.patch\n delete mode 100644 package/kernel/mac80211/patches/319-0005-brcmfmac-switch-to-C-function-__brcmf_err-for-printi.patch\n delete mode 100644 package/kernel/mac80211/patches/319-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch\n delete mode 100644 package/kernel/mac80211/patches/320-ath9k-clean-up-and-fix-ath_tx_count_airtime.patch\n delete mode 100644 package/kernel/mac80211/patches/321-mac80211-fix-CSA-in-IBSS-mode.patch\n delete mode 100644 package/kernel/mac80211/patches/322-mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0002-brcmfmac-always-print-error-when-PSM-s-watchdog-fire.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0003-brcmfmac-Do-not-print-the-firmware-version-as-an-err.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0005-brcmfmac-Handle-status-BRCMF_E_STATUS_ABORT-in-cfg80.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0006-brcmfmac-move-brcmf_txflowblock-to-bcdc-layer.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0007-brcmfmac-move-brcmf_txcomplete-to-bcdc-layer.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0008-brcmfmac-wrap-brcmf_fws_add_interface-into-bcdc-laye.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0009-brcmfmac-wrap-brcmf_fws_del_interface-into-bcdc-laye.patch\n delete mode 100644 package/kernel/mac80211/patches/323-0010-brcmfmac-wrap-brcmf_fws_reset_interface-into-bcdc-la.patch\n delete mode 100644 package/kernel/mac80211/patches/325-mac80211-unconditionally-start-new-netdev-queues-wit.patch\n delete mode 100644 package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch\n delete mode 100644 package/kernel/mac80211/patches/327-ath10k-increase-BMI-timeout.patch\n delete mode 100644 package/kernel/mac80211/patches/328-ath10k-log-when-longer-bmi-cmds-happen.patch\n delete mode 100644 package/kernel/mac80211/patches/329-ath10k-add-BMI-parameters-to-fix-calibration-from-DT.patch\n create mode 100644 package/kernel/mac80211/patches/910-ath10k-activate-user-space-firmware-loading-again.patch","diff":"diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile\nindex 1ac390d337..b8d856edf3 100644\n--- a/package/kernel/mac80211/Makefile\n+++ b/package/kernel/mac80211/Makefile\n@@ -10,14 +10,14 @@ include $(INCLUDE_DIR)/kernel.mk\n \n PKG_NAME:=mac80211\n \n-PKG_VERSION:=2017-01-31\n-PKG_RELEASE:=2\n-PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources\n+PKG_VERSION:=4.13-rc6\n+PKG_RELEASE:=1\n+PKG_SOURCE_URL:=https://www.hauke-m.de/files\n PKG_BACKPORT_VERSION:=\n-PKG_HASH:=75e6d39e34cf156212a2509172a4a62b673b69eb4a1d9aaa565f7fa719fa2317\n+PKG_HASH:=07fcefb7396aa2fb1ba84df1a6efc430989fc371410d2fe086e61355e747011b\n \n-PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.xz\n-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)\n+PKG_SOURCE:=backports-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.xz\n+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)\n PKG_BUILD_PARALLEL:=1\n \n PKG_MAINTAINER:=Felix Fietkau \n@@ -929,7 +929,7 @@ endef\n define KernelPackage/libipw\n $(call KernelPackage/mac80211/Default)\n TITLE:=libipw for ipw2100 and ipw2200\n- DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN\n+ DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-crypto-ecb +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN @!LINUX_3_18\n FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/ipw2x00/libipw.ko\n AUTOLOAD:=$(call AutoProbe,libipw)\n endef\n@@ -989,7 +989,7 @@ endef\n \n define KernelPackage/libertas-usb\n $(call KernelPackage/mac80211/Default)\n- DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 +@DRIVER_WEXT_SUPPORT +libertas-usb-firmware\n+ DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 +@DRIVER_WEXT_SUPPORT +libertas-usb-firmware @!LINUX_3_18\n TITLE:=Marvell 88W8015 Wireless Driver\n FILES:= \\\n \t$(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas.ko \\\n@@ -999,7 +999,7 @@ endef\n \n define KernelPackage/libertas-sdio\n $(call KernelPackage/mac80211/Default)\n- DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +kmod-mmc +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-sdio-firmware\n+ DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +kmod-mmc +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-sdio-firmware @!LINUX_3_18\n TITLE:=Marvell 88W8686 Wireless Driver\n FILES:= \\\n \t$(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas.ko \\\n@@ -1010,7 +1010,7 @@ endef\n define KernelPackage/libertas-spi\n $(call KernelPackage/mac80211/Default)\n SUBMENU:=Wireless Drivers\n- DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-spi-firmware\n+ DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-spi-firmware @!LINUX_3_18\n KCONFIG := \\\n \tCONFIG_SPI=y \\\n \tCONFIG_SPI_MASTER=y\ndiff --git a/package/kernel/mac80211/patches/001-fix_build.patch b/package/kernel/mac80211/patches/001-fix_build.patch\nindex 402649d2cc..9e272e90af 100644\n--- a/package/kernel/mac80211/patches/001-fix_build.patch\n+++ b/package/kernel/mac80211/patches/001-fix_build.patch\n@@ -24,7 +24,7 @@\n -.DEFAULT:\n +.SILENT: $(STAMP_KERNEL_CONFIG)\n +$(STAMP_KERNEL_CONFIG):\n- \t@set -e ; test -f .local-symbols || (\t\t\t\t\t\t\\\n+ \t@set -e ; test -f local-symbols || (\t\t\t\t\t\t\\\n \techo \"/--------------\"\t\t\t\t\t\t\t\t;\\\n \techo \"| You shouldn't run make in the backports tree, but only in\"\t\t;\\\n @@ -60,57 +62,61 @@ mrproper:\n@@ -34,7 +34,7 @@\n -\t@set -e ; if [ \"$$(cat .kernel_config_md5 2>/dev/null)\" != \"$(CONFIG_MD5)\" ]\t;\\\n -\tthen \t\t\t\t\t\t\t\t\t\t\\\n -\t\techo -n \"Generating local configuration database from kernel ...\"\t;\\\n--\t\tgrep -v -f .local-symbols $(KERNEL_CONFIG) | grep = | (\t\t\t\\\n+-\t\tgrep -v -f local-symbols $(KERNEL_CONFIG) | grep = | (\t\t\t\\\n -\t\t\twhile read l ; do\t\t\t\t\t\t\\\n -\t\t\t\tif [ \"$${l:0:7}\" != \"CONFIG_\" ] ; then\t\t\t\\\n -\t\t\t\t\tcontinue\t\t\t\t\t;\\\n@@ -85,9 +85,9 @@\n +\t@rm -f .kernel_config_md5_*\n +\t@touch $@\n +\n-+Kconfig.kernel: $(STAMP_KERNEL_CONFIG) .local-symbols\n++Kconfig.kernel: $(STAMP_KERNEL_CONFIG) local-symbols\n +\t@printf \"Generating local configuration database from kernel ...\"\n-+\t@grep -v -f .local-symbols $(KERNEL_CONFIG) | grep = | (\t\t\t\\\n++\t@grep -v -f local-symbols $(KERNEL_CONFIG) | grep = | (\t\t\t\\\n +\t\twhile read l ; do\t\t\t\t\t\t\\\n +\t\t\tif [ \"$${l:0:7}\" != \"CONFIG_\" ] ; then\t\t\t\\\n +\t\t\t\tcontinue\t\t\t\t\t;\\\n@@ -148,7 +148,7 @@\n \t@$(MAKE) oldconfig\n -\t@echo -n \"Building backport-include/backport/autoconf.h ...\"\n +\t@printf \"Building backport-include/backport/autoconf.h ...\"\n- \t@grep -f .local-symbols .config | (\t\t\t\t\\\n+ \t@grep -f local-symbols .config | (\t\t\t\t\\\n \t\techo \"#ifndef COMPAT_AUTOCONF_INCLUDED\"\t\t\t;\\\n \t\techo \"#define COMPAT_AUTOCONF_INCLUDED\"\t\t\t;\\\n @@ -80,7 +80,12 @@ backport-include/backport/autoconf.h: .c\ndiff --git a/package/kernel/mac80211/patches/002-change_allconfig.patch b/package/kernel/mac80211/patches/002-change_allconfig.patch\nindex a071ae6370..bd5bebfa45 100644\n--- a/package/kernel/mac80211/patches/002-change_allconfig.patch\n+++ b/package/kernel/mac80211/patches/002-change_allconfig.patch\n@@ -1,6 +1,6 @@\n --- a/kconf/conf.c\n +++ b/kconf/conf.c\n-@@ -594,40 +594,12 @@ int main(int ac, char **av)\n+@@ -593,40 +593,12 @@ int main(int ac, char **av)\n \tcase oldconfig:\n \tcase listnewconfig:\n \tcase olddefconfig:\n@@ -44,7 +44,7 @@\n \t\tbreak;\n --- a/kconf/confdata.c\n +++ b/kconf/confdata.c\n-@@ -1170,6 +1170,8 @@ bool conf_set_all_new_symbols(enum conf_\n+@@ -1169,6 +1169,8 @@ bool conf_set_all_new_symbols(enum conf_\n \t}\n \tbool has_changed = false;\n \n@@ -53,7 +53,7 @@\n \tfor_all_symbols(i, sym) {\n \t\tif (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))\n \t\t\tcontinue;\n-@@ -1213,8 +1215,6 @@ bool conf_set_all_new_symbols(enum conf_\n+@@ -1212,8 +1214,6 @@ bool conf_set_all_new_symbols(enum conf_\n \n \t}\n \ndiff --git a/package/kernel/mac80211/patches/004-kconfig_backport_fix.patch b/package/kernel/mac80211/patches/004-kconfig_backport_fix.patch\nindex f11029844c..2c9572ec93 100644\n--- a/package/kernel/mac80211/patches/004-kconfig_backport_fix.patch\n+++ b/package/kernel/mac80211/patches/004-kconfig_backport_fix.patch\n@@ -17,7 +17,7 @@\n #undef IS_ENABLED\n #define IS_ENABLED(option) \\\n (config_enabled(option) || config_enabled(option##_MODULE))\n-@@ -24,6 +27,8 @@\n+@@ -31,6 +34,8 @@\n #undef IS_BUILTIN\n #define IS_BUILTIN(option) config_enabled(option)\n \ndiff --git a/package/kernel/mac80211/patches/005-revert-devcoredump.patch b/package/kernel/mac80211/patches/005-revert-devcoredump.patch\nindex ff460900ff..1216b99574 100644\n--- a/package/kernel/mac80211/patches/005-revert-devcoredump.patch\n+++ b/package/kernel/mac80211/patches/005-revert-devcoredump.patch\n@@ -1,6 +1,6 @@\n --- a/compat/Makefile\n +++ b/compat/Makefile\n-@@ -35,8 +35,6 @@ compat-$(CPTCFG_KERNEL_4_6) += backport-\n+@@ -39,8 +39,6 @@ compat-$(CPTCFG_KERNEL_4_10) += backport\n \n compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o\n compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o\n@@ -9,144 +9,3 @@\n compat-$(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP) += drivers-base-devcoredump.o\n compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o\n cordic-objs += lib-cordic.o\n---- a/compat/drivers-base-devcoredump.c\n-+++ b/compat/drivers-base-devcoredump.c\n-@@ -31,6 +31,7 @@\n- #include \n- #include \n- #include \n-+#include \"backports.h\"\n- \n- static struct class devcd_class;\n- \n-@@ -40,6 +41,10 @@ static bool devcd_disabled;\n- /* if data isn't read by userspace after 5 minutes then delete it */\n- #define DEVCD_TIMEOUT\t(HZ * 60 * 5)\n- \n-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)\n-+static struct bin_attribute devcd_attr_data;\n-+#endif\n-+\n- struct devcd_entry {\n- \tstruct device devcd_dev;\n- \tvoid *data;\n-@@ -69,8 +74,7 @@ static void devcd_dev_release(struct dev\n- \t * a struct device to know when it goes away?\n- \t */\n- \tif (devcd->failing_dev->kobj.sd)\n--\t\tsysfs_delete_link(&devcd->failing_dev->kobj, &dev->kobj,\n--\t\t\t\t \"devcoredump\");\n-+\t\tsysfs_remove_link(&devcd->failing_dev->kobj, \"devcoredump\");\n- \n- \tput_device(devcd->failing_dev);\n- \tkfree(devcd);\n-@@ -82,6 +86,9 @@ static void devcd_del(struct work_struct\n- \n- \tdevcd = container_of(wk, struct devcd_entry, del_wk.work);\n- \n-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)\n-+\tdevice_remove_bin_file(&devcd->devcd_dev, &devcd_attr_data);\n-+#endif\n- \tdevice_del(&devcd->devcd_dev);\n- \tput_device(&devcd->devcd_dev);\n- }\n-@@ -115,6 +122,7 @@ static struct bin_attribute devcd_attr_d\n- \t.write = devcd_data_write,\n- };\n- \n-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)\n- static struct bin_attribute *devcd_dev_bin_attrs[] = {\n- \t&devcd_attr_data, NULL,\n- };\n-@@ -126,6 +134,7 @@ static const struct attribute_group devc\n- static const struct attribute_group *devcd_dev_groups[] = {\n- \t&devcd_dev_group, NULL,\n- };\n-+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) */\n- \n- static int devcd_free(struct device *dev, void *data)\n- {\n-@@ -160,18 +169,11 @@ static ssize_t disabled_store(struct cla\n- \n- \treturn count;\n- }\n--static CLASS_ATTR_RW(disabled);\n- \n--static struct attribute *devcd_class_attrs[] = {\n--\t&class_attr_disabled.attr,\n--\tNULL,\n-+static struct class_attribute devcd_class_attrs[] = {\n-+\t__ATTR_RW(disabled),\n-+\t__ATTR_NULL\n- };\n--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)\n--ATTRIBUTE_GROUPS(devcd_class);\n--#else\n--#define BP_ATTR_GRP_STRUCT device_attribute\n--ATTRIBUTE_GROUPS_BACKPORT(devcd_class);\n--#endif\n- \n- static struct class devcd_class = {\n- \t.name\t\t= \"devcoredump\",\n-@@ -179,10 +181,8 @@ static struct class devcd_class = {\n- \t.dev_release\t= devcd_dev_release,\n- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)\n- \t.dev_groups\t= devcd_dev_groups,\n--#else\n--\t.dev_attrs = devcd_class_dev_attrs,\n- #endif\n--\t.class_groups\t= devcd_class_groups,\n-+\t.class_attrs\t= devcd_class_attrs,\n- };\n- \n- static ssize_t devcd_readv(char *buffer, loff_t offset, size_t count,\n-@@ -325,6 +325,11 @@ void dev_coredumpm(struct device *dev, s\n- \tif (device_add(&devcd->devcd_dev))\n- \t\tgoto put_device;\n- \n-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)\n-+\tif (device_create_bin_file(&devcd->devcd_dev, &devcd_attr_data))\n-+\t\tgoto put_device;\n-+#endif\n-+\n- \tif (sysfs_create_link(&devcd->devcd_dev.kobj, &dev->kobj,\n- \t\t\t \"failing_device\"))\n- \t\t/* nothing - symlink will be missing */;\n-@@ -367,16 +372,13 @@ void dev_coredumpsg(struct device *dev,\n- }\n- EXPORT_SYMBOL_GPL(dev_coredumpsg);\n- \n--static int __init devcoredump_init(void)\n-+int __init devcoredump_init(void)\n- {\n--\tinit_devcd_class_attrs();\n- \treturn class_register(&devcd_class);\n- }\n--__initcall(devcoredump_init);\n- \n--static void __exit devcoredump_exit(void)\n-+void __exit devcoredump_exit(void)\n- {\n- \tclass_for_each_device(&devcd_class, NULL, NULL, devcd_free);\n- \tclass_unregister(&devcd_class);\n- }\n--__exitcall(devcoredump_exit);\n---- a/include/linux/backport-devcoredump.h\n-+++ b/include/linux/backport-devcoredump.h\n-@@ -66,7 +66,7 @@ static inline void _devcd_free_sgtable(s\n- }\n- \n- \n--#ifdef CONFIG_DEV_COREDUMP\n-+#ifdef CPTCFG_BPAUTO_WANT_DEV_COREDUMP\n- void dev_coredumpv(struct device *dev, void *data, size_t datalen,\n- \t\t gfp_t gfp);\n- \n-@@ -100,6 +100,6 @@ static inline void dev_coredumpsg(struct\n- {\n- \t_devcd_free_sgtable(table);\n- }\n--#endif /* CONFIG_DEV_COREDUMP */\n-+#endif /* CPTCFG_BPAUTO_WANT_DEV_COREDUMP */\n- \n- #endif /* __DEVCOREDUMP_H */\ndiff --git a/package/kernel/mac80211/patches/006-revert-ktime-changes.patch b/package/kernel/mac80211/patches/006-revert-ktime-changes.patch\ndeleted file mode 100644\nindex b839eb4c8d..0000000000\n--- a/package/kernel/mac80211/patches/006-revert-ktime-changes.patch\n+++ /dev/null\n@@ -1,20 +0,0 @@\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c\n-@@ -177,7 +177,7 @@ static bool rt2800usb_tx_sta_fifo_read_c\n- \tif (rt2800usb_txstatus_pending(rt2x00dev)) {\n- \t\t/* Read register after 1 ms */\n- \t\thrtimer_start(&rt2x00dev->txstatus_timer,\n--\t\t\t TXSTATUS_READ_INTERVAL,\n-+\t\t\t ktime_set(0, TXSTATUS_READ_INTERVAL),\n- \t\t\t HRTIMER_MODE_REL);\n- \t\treturn false;\n- \t}\n-@@ -204,7 +204,7 @@ static void rt2800usb_async_read_tx_stat\n- \n- \t/* Read TX_STA_FIFO register after 2 ms */\n- \thrtimer_start(&rt2x00dev->txstatus_timer,\n--\t\t 2 * TXSTATUS_READ_INTERVAL,\n-+\t\t ktime_set(0, 2*TXSTATUS_READ_INTERVAL),\n- \t\t HRTIMER_MODE_REL);\n- }\n- \ndiff --git a/package/kernel/mac80211/patches/007-revert-genetlink-changes.patch b/package/kernel/mac80211/patches/007-revert-genetlink-changes.patch\ndeleted file mode 100644\nindex 1a85106bc2..0000000000\n--- a/package/kernel/mac80211/patches/007-revert-genetlink-changes.patch\n+++ /dev/null\n@@ -1,266 +0,0 @@\n---- a/net/wireless/nl80211.c\n-+++ b/net/wireless/nl80211.c\n-@@ -32,8 +32,22 @@ static int nl80211_crypto_settings(struc\n- \t\t\t\t struct cfg80211_crypto_settings *settings,\n- \t\t\t\t int cipher_limit);\n- \n-+static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,\n-+\t\t\t struct genl_info *info);\n-+static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,\n-+\t\t\t struct genl_info *info);\n-+\n- /* the netlink family */\n--static struct genl_family nl80211_fam;\n-+static struct genl_family nl80211_fam = {\n-+\t.id = GENL_ID_GENERATE,\t\t/* don't bother with a hardcoded ID */\n-+\t.name = NL80211_GENL_NAME,\t/* have users key off the name instead */\n-+\t.hdrsize = 0,\t\t\t/* no private header */\n-+\t.version = 1,\t\t\t/* no particular meaning now */\n-+\t.maxattr = NL80211_ATTR_MAX,\n-+\t.netnsok = true,\n-+\t.pre_doit = nl80211_pre_doit,\n-+\t.post_doit = nl80211_post_doit,\n-+};\n- \n- /* multicast groups */\n- enum nl80211_multicast_groups {\n-@@ -549,14 +563,13 @@ static int nl80211_prepare_wdev_dump(str\n- \n- \tif (!cb->args[0]) {\n- \t\terr = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,\n--\t\t\t\t genl_family_attrbuf(&nl80211_fam),\n--\t\t\t\t nl80211_fam.maxattr, nl80211_policy);\n-+\t\t\t\t nl80211_fam.attrbuf, nl80211_fam.maxattr,\n-+\t\t\t\t nl80211_policy);\n- \t\tif (err)\n- \t\t\tgoto out_unlock;\n- \n--\t\t*wdev = __cfg80211_wdev_from_attrs(\n--\t\t\t\t\tsock_net(skb->sk),\n--\t\t\t\t\tgenl_family_attrbuf(&nl80211_fam));\n-+\t\t*wdev = __cfg80211_wdev_from_attrs(sock_net(skb->sk),\n-+\t\t\t\t\t\t nl80211_fam.attrbuf);\n- \t\tif (IS_ERR(*wdev)) {\n- \t\t\terr = PTR_ERR(*wdev);\n- \t\t\tgoto out_unlock;\n-@@ -1903,7 +1916,7 @@ static int nl80211_dump_wiphy_parse(stru\n- \t\t\t\t struct netlink_callback *cb,\n- \t\t\t\t struct nl80211_dump_wiphy_state *state)\n- {\n--\tstruct nlattr **tb = genl_family_attrbuf(&nl80211_fam);\n-+\tstruct nlattr **tb = nl80211_fam.attrbuf;\n- \tint ret = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,\n- \t\t\t tb, nl80211_fam.maxattr, nl80211_policy);\n- \t/* ignore parse errors for backward compatibility */\n-@@ -7733,7 +7746,6 @@ static int nl80211_send_survey(struct sk\n- \n- static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)\n- {\n--\tstruct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);\n- \tstruct survey_info survey;\n- \tstruct cfg80211_registered_device *rdev;\n- \tstruct wireless_dev *wdev;\n-@@ -7746,7 +7758,7 @@ static int nl80211_dump_survey(struct sk\n- \t\treturn res;\n- \n- \t/* prepare_wdev_dump parsed the attributes */\n--\tradio_stats = attrbuf[NL80211_ATTR_SURVEY_RADIO_STATS];\n-+\tradio_stats = nl80211_fam.attrbuf[NL80211_ATTR_SURVEY_RADIO_STATS];\n- \n- \tif (!wdev->netdev) {\n- \t\tres = -EINVAL;\n-@@ -8594,14 +8606,14 @@ static int nl80211_testmode_dump(struct\n- \t\t */\n- \t\tphy_idx = cb->args[0] - 1;\n- \t} else {\n--\t\tstruct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);\n--\n- \t\terr = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,\n--\t\t\t\t attrbuf, nl80211_fam.maxattr, nl80211_policy);\n-+\t\t\t\t nl80211_fam.attrbuf, nl80211_fam.maxattr,\n-+\t\t\t\t nl80211_policy);\n- \t\tif (err)\n- \t\t\tgoto out_err;\n- \n--\t\trdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk), attrbuf);\n-+\t\trdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk),\n-+\t\t\t\t\t\t nl80211_fam.attrbuf);\n- \t\tif (IS_ERR(rdev)) {\n- \t\t\terr = PTR_ERR(rdev);\n- \t\t\tgoto out_err;\n-@@ -8609,8 +8621,9 @@ static int nl80211_testmode_dump(struct\n- \t\tphy_idx = rdev->wiphy_idx;\n- \t\trdev = NULL;\n- \n--\t\tif (attrbuf[NL80211_ATTR_TESTDATA])\n--\t\t\tcb->args[1] = (long)attrbuf[NL80211_ATTR_TESTDATA];\n-+\t\tif (nl80211_fam.attrbuf[NL80211_ATTR_TESTDATA])\n-+\t\t\tcb->args[1] =\n-+\t\t\t\t(long)nl80211_fam.attrbuf[NL80211_ATTR_TESTDATA];\n- \t}\n- \n- \tif (cb->args[1]) {\n-@@ -10814,7 +10827,8 @@ static int handle_nan_filter(struct nlat\n- \n- \ti = 0;\n- \tnla_for_each_nested(attr, attr_filter, rem) {\n--\t\tfilter[i].filter = nla_memdup(attr, GFP_KERNEL);\n-+\t\tfilter[i].filter = kmemdup(nla_data(attr), nla_len(attr),\n-+\t\t\t\t\t GFP_KERNEL);\n- \t\tfilter[i].len = nla_len(attr);\n- \t\ti++;\n- \t}\n-@@ -11450,7 +11464,6 @@ static int nl80211_prepare_vendor_dump(s\n- \t\t\t\t struct cfg80211_registered_device **rdev,\n- \t\t\t\t struct wireless_dev **wdev)\n- {\n--\tstruct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);\n- \tu32 vid, subcmd;\n- \tunsigned int i;\n- \tint vcmd_idx = -1;\n-@@ -11486,28 +11499,31 @@ static int nl80211_prepare_vendor_dump(s\n- \t}\n- \n- \terr = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,\n--\t\t\t attrbuf, nl80211_fam.maxattr, nl80211_policy);\n-+\t\t\t nl80211_fam.attrbuf, nl80211_fam.maxattr,\n-+\t\t\t nl80211_policy);\n- \tif (err)\n- \t\tgoto out_unlock;\n- \n--\tif (!attrbuf[NL80211_ATTR_VENDOR_ID] ||\n--\t !attrbuf[NL80211_ATTR_VENDOR_SUBCMD]) {\n-+\tif (!nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_ID] ||\n-+\t !nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_SUBCMD]) {\n- \t\terr = -EINVAL;\n- \t\tgoto out_unlock;\n- \t}\n- \n--\t*wdev = __cfg80211_wdev_from_attrs(sock_net(skb->sk), attrbuf);\n-+\t*wdev = __cfg80211_wdev_from_attrs(sock_net(skb->sk),\n-+\t\t\t\t\t nl80211_fam.attrbuf);\n- \tif (IS_ERR(*wdev))\n- \t\t*wdev = NULL;\n- \n--\t*rdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk), attrbuf);\n-+\t*rdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk),\n-+\t\t\t\t\t nl80211_fam.attrbuf);\n- \tif (IS_ERR(*rdev)) {\n- \t\terr = PTR_ERR(*rdev);\n- \t\tgoto out_unlock;\n- \t}\n- \n--\tvid = nla_get_u32(attrbuf[NL80211_ATTR_VENDOR_ID]);\n--\tsubcmd = nla_get_u32(attrbuf[NL80211_ATTR_VENDOR_SUBCMD]);\n-+\tvid = nla_get_u32(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_ID]);\n-+\tsubcmd = nla_get_u32(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_SUBCMD]);\n- \n- \tfor (i = 0; i < (*rdev)->wiphy.n_vendor_commands; i++) {\n- \t\tconst struct wiphy_vendor_command *vcmd;\n-@@ -11531,9 +11547,9 @@ static int nl80211_prepare_vendor_dump(s\n- \t\tgoto out_unlock;\n- \t}\n- \n--\tif (attrbuf[NL80211_ATTR_VENDOR_DATA]) {\n--\t\tdata = nla_data(attrbuf[NL80211_ATTR_VENDOR_DATA]);\n--\t\tdata_len = nla_len(attrbuf[NL80211_ATTR_VENDOR_DATA]);\n-+\tif (nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_DATA]) {\n-+\t\tdata = nla_data(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_DATA]);\n-+\t\tdata_len = nla_len(nl80211_fam.attrbuf[NL80211_ATTR_VENDOR_DATA]);\n- \t}\n- \n- \t/* 0 is the first index - add 1 to parse only once */\n-@@ -12795,21 +12811,6 @@ static __genl_const struct genl_ops nl80\n- \t},\n- };\n- \n--static struct genl_family nl80211_fam __ro_after_init = {\n--\t.name = NL80211_GENL_NAME,\t/* have users key off the name instead */\n--\t.hdrsize = 0,\t\t\t/* no private header */\n--\t.version = 1,\t\t\t/* no particular meaning now */\n--\t.maxattr = NL80211_ATTR_MAX,\n--\t.netnsok = true,\n--\t.pre_doit = nl80211_pre_doit,\n--\t.post_doit = nl80211_post_doit,\n--\t.module = THIS_MODULE,\n--\t.ops = nl80211_ops,\n--\t.n_ops = ARRAY_SIZE(nl80211_ops),\n--\t.mcgrps = nl80211_mcgrps,\n--\t.n_mcgrps = ARRAY_SIZE(nl80211_mcgrps),\n--};\n--\n- /* notification functions */\n- \n- void nl80211_notify_wiphy(struct cfg80211_registered_device *rdev,\n-@@ -14759,11 +14760,12 @@ void nl80211_send_ap_stopped(struct wire\n- \n- /* initialisation/exit functions */\n- \n--int __init nl80211_init(void)\n-+int nl80211_init(void)\n- {\n- \tint err;\n- \n--\terr = genl_register_family(&nl80211_fam);\n-+\terr = genl_register_family_with_ops_groups(&nl80211_fam, nl80211_ops,\n-+\t\t\t\t\t\t nl80211_mcgrps);\n- \tif (err)\n- \t\treturn err;\n- \n---- a/drivers/net/wireless/mac80211_hwsim.c\n-+++ b/drivers/net/wireless/mac80211_hwsim.c\n-@@ -587,8 +587,15 @@ struct hwsim_radiotap_ack_hdr {\n- \t__le16 rt_chbitmask;\n- } __packed;\n- \n--/* MAC80211_HWSIM netlink family */\n--static struct genl_family hwsim_genl_family;\n-+/* MAC80211_HWSIM netlinf family */\n-+static struct genl_family hwsim_genl_family = {\n-+\t.id = GENL_ID_GENERATE,\n-+\t.hdrsize = 0,\n-+\t.name = \"MAC80211_HWSIM\",\n-+\t.version = 1,\n-+\t.maxattr = HWSIM_ATTR_MAX,\n-+\t.netnsok = true,\n-+};\n- \n- enum hwsim_multicast_groups {\n- \tHWSIM_MCGRP_CONFIG,\n-@@ -3250,18 +3257,6 @@ static __genl_const struct genl_ops hwsi\n- \t},\n- };\n- \n--static struct genl_family hwsim_genl_family __ro_after_init = {\n--\t.name = \"MAC80211_HWSIM\",\n--\t.version = 1,\n--\t.maxattr = HWSIM_ATTR_MAX,\n--\t.netnsok = true,\n--\t.module = THIS_MODULE,\n--\t.ops = hwsim_ops,\n--\t.n_ops = ARRAY_SIZE(hwsim_ops),\n--\t.mcgrps = hwsim_mcgrps,\n--\t.n_mcgrps = ARRAY_SIZE(hwsim_mcgrps),\n--};\n--\n- static void destroy_radio(struct work_struct *work)\n- {\n- \tstruct mac80211_hwsim_data *data =\n-@@ -3309,13 +3304,15 @@ static struct notifier_block hwsim_netli\n- \t.notifier_call = mac80211_hwsim_netlink_notify,\n- };\n- \n--static int __init hwsim_init_netlink(void)\n-+static int hwsim_init_netlink(void)\n- {\n- \tint rc;\n- \n- \tprintk(KERN_INFO \"mac80211_hwsim: initializing netlink\\n\");\n- \n--\trc = genl_register_family(&hwsim_genl_family);\n-+\trc = genl_register_family_with_ops_groups(&hwsim_genl_family,\n-+\t\t\t\t\t\t hwsim_ops,\n-+\t\t\t\t\t\t hwsim_mcgrps);\n- \tif (rc)\n- \t\tgoto failure;\n- \ndiff --git a/package/kernel/mac80211/patches/008-revert-ndo_stats64-cleanup.patch b/package/kernel/mac80211/patches/008-revert-ndo_stats64-cleanup.patch\ndeleted file mode 100644\nindex 0f6f0f919f..0000000000\n--- a/package/kernel/mac80211/patches/008-revert-ndo_stats64-cleanup.patch\n+++ /dev/null\n@@ -1,20 +0,0 @@\n---- a/net/mac80211/iface.c\n-+++ b/net/mac80211/iface.c\n-@@ -1133,7 +1133,7 @@ static u16 ieee80211_netdev_select_queue\n- \treturn ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);\n- }\n- \n--static void\n-+static struct rtnl_link_stats64 *\n- ieee80211_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)\n- {\n- \tint i;\n-@@ -1158,6 +1158,8 @@ ieee80211_get_stats64(struct net_device\n- \t\tstats->rx_bytes += rx_bytes;\n- \t\tstats->tx_bytes += tx_bytes;\n- \t}\n-+\n-+\treturn stats;\n- }\n- \n- static const struct net_device_ops ieee80211_dataif_ops = {\ndiff --git a/package/kernel/mac80211/patches/009-revert-mtu-changes.patch b/package/kernel/mac80211/patches/009-revert-mtu-changes.patch\ndeleted file mode 100644\nindex f5e2757d3f..0000000000\n--- a/package/kernel/mac80211/patches/009-revert-mtu-changes.patch\n+++ /dev/null\n@@ -1,338 +0,0 @@\n---- a/net/mac80211/iface.c\n-+++ b/net/mac80211/iface.c\n-@@ -151,6 +151,15 @@ void ieee80211_recalc_idle(struct ieee80\n- \t\tieee80211_hw_config(local, change);\n- }\n- \n-+static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)\n-+{\n-+\tif (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN)\n-+\t\treturn -EINVAL;\n-+\n-+\tdev->mtu = new_mtu;\n-+\treturn 0;\n-+}\n-+\n- static int ieee80211_verify_mac(struct ieee80211_sub_if_data *sdata, u8 *addr,\n- \t\t\t\tbool check_dup)\n- {\n-@@ -1168,6 +1177,7 @@ static const struct net_device_ops ieee8\n- \t.ndo_uninit\t\t= ieee80211_uninit,\n- \t.ndo_start_xmit\t\t= ieee80211_subif_start_xmit,\n- \t.ndo_set_rx_mode\t= ieee80211_set_multicast_list,\n-+\t.ndo_change_mtu \t= ieee80211_change_mtu,\n- \t.ndo_set_mac_address \t= ieee80211_change_mac,\n- \t.ndo_select_queue\t= ieee80211_netdev_select_queue,\n- \t.ndo_get_stats64\t= ieee80211_get_stats64,\n-@@ -1211,6 +1221,7 @@ static const struct net_device_ops ieee8\n- \t.ndo_uninit\t\t= ieee80211_uninit,\n- \t.ndo_start_xmit\t\t= ieee80211_monitor_start_xmit,\n- \t.ndo_set_rx_mode\t= ieee80211_set_multicast_list,\n-+\t.ndo_change_mtu \t= ieee80211_change_mtu,\n- \t.ndo_set_mac_address \t= ieee80211_change_mac,\n- \t.ndo_select_queue\t= ieee80211_monitor_select_queue,\n- \t.ndo_get_stats64\t= ieee80211_get_stats64,\n-@@ -1919,10 +1930,6 @@ int ieee80211_if_add(struct ieee80211_lo\n- \n- \t\tnetdev_set_default_ethtool_ops(ndev, &ieee80211_ethtool_ops);\n- \n--\t\t/* MTU range: 256 - 2304 */\n--\t\tndev->min_mtu = 256;\n--\t\tndev->max_mtu = IEEE80211_MAX_DATA_LEN;\n--\n- \t\tret = register_netdevice(ndev);\n- \t\tif (ret) {\n- \t\t\tieee80211_if_free(ndev);\n---- a/drivers/net/wireless/ath/wil6210/netdev.c\n-+++ b/drivers/net/wireless/ath/wil6210/netdev.c\n-@@ -42,6 +42,21 @@ static int wil_stop(struct net_device *n\n- \treturn wil_down(wil);\n- }\n- \n-+static int wil_change_mtu(struct net_device *ndev, int new_mtu)\n-+{\n-+\tstruct wil6210_priv *wil = ndev_to_wil(ndev);\n-+\n-+\tif (new_mtu < 68 || new_mtu > mtu_max) {\n-+\t\twil_err(wil, \"invalid MTU %d\\n\", new_mtu);\n-+\t\treturn -EINVAL;\n-+\t}\n-+\n-+\twil_dbg_misc(wil, \"change MTU %d -> %d\\n\", ndev->mtu, new_mtu);\n-+\tndev->mtu = new_mtu;\n-+\n-+\treturn 0;\n-+}\n-+\n- static int wil_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)\n- {\n- \tstruct wil6210_priv *wil = ndev_to_wil(ndev);\n-@@ -55,6 +70,7 @@ static const struct net_device_ops wil_n\n- \t.ndo_start_xmit\t\t= wil_start_xmit,\n- \t.ndo_set_mac_address\t= eth_mac_addr,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n-+\t.ndo_change_mtu\t\t= wil_change_mtu,\n- \t.ndo_do_ioctl\t\t= wil_do_ioctl,\n- };\n- \n-@@ -111,7 +127,6 @@ static int wil6210_netdev_poll_tx(struct\n- static void wil_dev_setup(struct net_device *dev)\n- {\n- \tether_setup(dev);\n--\tdev->max_mtu = mtu_max;\n- \tdev->tx_queue_len = WIL_TX_Q_LEN_DEFAULT;\n- }\n- \n---- a/drivers/net/wireless/atmel/atmel.c\n-+++ b/drivers/net/wireless/atmel/atmel.c\n-@@ -1295,6 +1295,14 @@ static struct iw_statistics *atmel_get_w\n- \treturn &priv->wstats;\n- }\n- \n-+static int atmel_change_mtu(struct net_device *dev, int new_mtu)\n-+{\n-+\tif ((new_mtu < 68) || (new_mtu > 2312))\n-+\t\treturn -EINVAL;\n-+\tdev->mtu = new_mtu;\n-+\treturn 0;\n-+}\n-+\n- static int atmel_set_mac_address(struct net_device *dev, void *p)\n- {\n- \tstruct sockaddr *addr = p;\n-@@ -1498,6 +1506,7 @@ static const struct file_operations atme\n- static const struct net_device_ops atmel_netdev_ops = {\n- \t.ndo_open \t\t= atmel_open,\n- \t.ndo_stop\t\t= atmel_close,\n-+\t.ndo_change_mtu \t= atmel_change_mtu,\n- \t.ndo_set_mac_address \t= atmel_set_mac_address,\n- \t.ndo_start_xmit \t= start_tx,\n- \t.ndo_do_ioctl \t\t= atmel_ioctl,\n-@@ -1591,10 +1600,6 @@ struct net_device *init_atmel_card(unsig\n- \tdev->irq = irq;\n- \tdev->base_addr = port;\n- \n--\t/* MTU range: 68 - 2312 */\n--\tdev->min_mtu = 68;\n--\tdev->max_mtu = MAX_WIRELESS_BODY - ETH_FCS_LEN;\n--\n- \tSET_NETDEV_DEV(dev, sys_dev);\n- \n- \tif ((rc = request_irq(dev->irq, service_interrupt, IRQF_SHARED, dev->name, dev))) {\n---- a/drivers/net/wireless/cisco/airo.c\n-+++ b/drivers/net/wireless/cisco/airo.c\n-@@ -2329,6 +2329,14 @@ static int airo_set_mac_address(struct n\n- \treturn 0;\n- }\n- \n-+static int airo_change_mtu(struct net_device *dev, int new_mtu)\n-+{\n-+\tif ((new_mtu < 68) || (new_mtu > 2400))\n-+\t\treturn -EINVAL;\n-+\tdev->mtu = new_mtu;\n-+\treturn 0;\n-+}\n-+\n- static LIST_HEAD(airo_devices);\n- \n- static void add_airo_dev(struct airo_info *ai)\n-@@ -2648,6 +2656,7 @@ static const struct net_device_ops airo1\n- \t.ndo_get_stats \t\t= airo_get_stats,\n- \t.ndo_set_mac_address\t= airo_set_mac_address,\n- \t.ndo_do_ioctl\t\t= airo_ioctl,\n-+\t.ndo_change_mtu\t\t= airo_change_mtu,\n- };\n- \n- static void wifi_setup(struct net_device *dev)\n-@@ -2659,8 +2668,6 @@ static void wifi_setup(struct net_device\n- \tdev->type = ARPHRD_IEEE80211;\n- \tdev->hard_header_len = ETH_HLEN;\n- \tdev->mtu = AIRO_DEF_MTU;\n--\tdev->min_mtu = 68;\n--\tdev->max_mtu = MIC_MSGLEN_MAX;\n- \tdev->addr_len = ETH_ALEN;\n- \tdev->tx_queue_len = 100; \n- \n-@@ -2747,6 +2754,7 @@ static const struct net_device_ops airo_\n- \t.ndo_set_rx_mode\t= airo_set_multicast_list,\n- \t.ndo_set_mac_address\t= airo_set_mac_address,\n- \t.ndo_do_ioctl\t\t= airo_ioctl,\n-+\t.ndo_change_mtu\t\t= airo_change_mtu,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n- };\n- \n-@@ -2758,6 +2766,7 @@ static const struct net_device_ops mpi_n\n- \t.ndo_set_rx_mode\t= airo_set_multicast_list,\n- \t.ndo_set_mac_address\t= airo_set_mac_address,\n- \t.ndo_do_ioctl\t\t= airo_ioctl,\n-+\t.ndo_change_mtu\t\t= airo_change_mtu,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n- };\n- \n-@@ -2813,7 +2822,6 @@ static struct net_device *_init_airo_car\n- \tdev->irq = irq;\n- \tdev->base_addr = port;\n- \tdev->priv_flags &= ~IFF_TX_SKB_SHARING;\n--\tdev->max_mtu = MIC_MSGLEN_MAX;\n- \n- \tSET_NETDEV_DEV(dev, dmdev);\n- \n---- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c\n-+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c\n-@@ -6039,6 +6039,7 @@ static const struct net_device_ops ipw21\n- \t.ndo_open\t\t= ipw2100_open,\n- \t.ndo_stop\t\t= ipw2100_close,\n- \t.ndo_start_xmit\t\t= libipw_xmit,\n-+\t.ndo_change_mtu\t\t= libipw_change_mtu,\n- \t.ndo_tx_timeout\t\t= ipw2100_tx_timeout,\n- \t.ndo_set_mac_address\t= ipw2100_set_address,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n-@@ -6074,8 +6075,6 @@ static struct net_device *ipw2100_alloc_\n- \tdev->wireless_data = &priv->wireless_data;\n- \tdev->watchdog_timeo = 3 * HZ;\n- \tdev->irq = 0;\n--\tdev->min_mtu = 68;\n--\tdev->max_mtu = LIBIPW_DATA_LEN;\n- \n- \t/* NOTE: We don't use the wireless_handlers hook\n- \t * in dev as the system will start throwing WX requests\n---- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c\n-+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c\n-@@ -11561,6 +11561,7 @@ static const struct net_device_ops ipw_p\n- \t.ndo_open \t\t= ipw_prom_open,\n- \t.ndo_stop\t\t= ipw_prom_stop,\n- \t.ndo_start_xmit\t\t= ipw_prom_hard_start_xmit,\n-+\t.ndo_change_mtu\t\t= libipw_change_mtu,\n- \t.ndo_set_mac_address \t= eth_mac_addr,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n- };\n-@@ -11586,9 +11587,6 @@ static int ipw_prom_alloc(struct ipw_pri\n- \tpriv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;\n- \tpriv->prom_net_dev->netdev_ops = &ipw_prom_netdev_ops;\n- \n--\tpriv->prom_net_dev->min_mtu = 68;\n--\tpriv->prom_net_dev->max_mtu = LIBIPW_DATA_LEN;\n--\n- \tpriv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;\n- \tSET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);\n- \n-@@ -11621,6 +11619,7 @@ static const struct net_device_ops ipw_n\n- \t.ndo_set_rx_mode\t= ipw_net_set_multicast_list,\n- \t.ndo_set_mac_address\t= ipw_net_set_mac_address,\n- \t.ndo_start_xmit\t\t= libipw_xmit,\n-+\t.ndo_change_mtu\t\t= libipw_change_mtu,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n- };\n- \n-@@ -11730,9 +11729,6 @@ static int ipw_pci_probe(struct pci_dev\n- \tnet_dev->wireless_handlers = &ipw_wx_handler_def;\n- \tnet_dev->ethtool_ops = &ipw_ethtool_ops;\n- \n--\tnet_dev->min_mtu = 68;\n--\tnet_dev->max_mtu = LIBIPW_DATA_LEN;\n--\n- \terr = sysfs_create_group(&pdev->dev.kobj, &ipw_attribute_group);\n- \tif (err) {\n- \t\tIPW_ERROR(\"failed to create sysfs device attributes\\n\");\n---- a/drivers/net/wireless/intel/ipw2x00/libipw.h\n-+++ b/drivers/net/wireless/intel/ipw2x00/libipw.h\n-@@ -948,6 +948,7 @@ static inline int libipw_is_cck_rate(u8\n- /* libipw.c */\n- void free_libipw(struct net_device *dev, int monitor);\n- struct net_device *alloc_libipw(int sizeof_priv, int monitor);\n-+int libipw_change_mtu(struct net_device *dev, int new_mtu);\n- \n- void libipw_networks_age(struct libipw_device *ieee, unsigned long age_secs);\n- \n---- a/drivers/net/wireless/intel/ipw2x00/libipw_module.c\n-+++ b/drivers/net/wireless/intel/ipw2x00/libipw_module.c\n-@@ -118,6 +118,15 @@ static void libipw_networks_initialize(s\n- \t\t\t &ieee->network_free_list);\n- }\n- \n-+int libipw_change_mtu(struct net_device *dev, int new_mtu)\n-+{\n-+\tif ((new_mtu < 68) || (new_mtu > LIBIPW_DATA_LEN))\n-+\t\treturn -EINVAL;\n-+\tdev->mtu = new_mtu;\n-+\treturn 0;\n-+}\n-+EXPORT_SYMBOL(libipw_change_mtu);\n-+\n- struct net_device *alloc_libipw(int sizeof_priv, int monitor)\n- {\n- \tstruct libipw_device *ieee;\n---- a/drivers/net/wireless/intersil/hostap/hostap_main.c\n-+++ b/drivers/net/wireless/intersil/hostap/hostap_main.c\n-@@ -765,6 +765,16 @@ static void hostap_set_multicast_list(st\n- }\n- \n- \n-+static int prism2_change_mtu(struct net_device *dev, int new_mtu)\n-+{\n-+\tif (new_mtu < PRISM2_MIN_MTU || new_mtu > PRISM2_MAX_MTU)\n-+\t\treturn -EINVAL;\n-+\n-+\tdev->mtu = new_mtu;\n-+\treturn 0;\n-+}\n-+\n-+\n- static void prism2_tx_timeout(struct net_device *dev)\n- {\n- \tstruct hostap_interface *iface;\n-@@ -803,6 +813,7 @@ static const struct net_device_ops hosta\n- \t.ndo_do_ioctl\t\t= hostap_ioctl,\n- \t.ndo_set_mac_address\t= prism2_set_mac_address,\n- \t.ndo_set_rx_mode\t= hostap_set_multicast_list,\n-+\t.ndo_change_mtu \t= prism2_change_mtu,\n- \t.ndo_tx_timeout \t= prism2_tx_timeout,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n- };\n-@@ -815,6 +826,7 @@ static const struct net_device_ops hosta\n- \t.ndo_do_ioctl\t\t= hostap_ioctl,\n- \t.ndo_set_mac_address\t= prism2_set_mac_address,\n- \t.ndo_set_rx_mode\t= hostap_set_multicast_list,\n-+\t.ndo_change_mtu \t= prism2_change_mtu,\n- \t.ndo_tx_timeout \t= prism2_tx_timeout,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n- };\n-@@ -827,6 +839,7 @@ static const struct net_device_ops hosta\n- \t.ndo_do_ioctl\t\t= hostap_ioctl,\n- \t.ndo_set_mac_address\t= prism2_set_mac_address,\n- \t.ndo_set_rx_mode\t= hostap_set_multicast_list,\n-+\t.ndo_change_mtu \t= prism2_change_mtu,\n- \t.ndo_tx_timeout \t= prism2_tx_timeout,\n- \t.ndo_validate_addr\t= eth_validate_addr,\n- };\n-@@ -838,8 +851,6 @@ void hostap_setup_dev(struct net_device\n- \n- \tiface = netdev_priv(dev);\n- \tether_setup(dev);\n--\tdev->min_mtu = PRISM2_MIN_MTU;\n--\tdev->max_mtu = PRISM2_MAX_MTU;\n- \tdev->priv_flags &= ~IFF_TX_SKB_SHARING;\n- \n- \t/* kernel callbacks */\n---- a/drivers/net/wireless/intersil/orinoco/main.c\n-+++ b/drivers/net/wireless/intersil/orinoco/main.c\n-@@ -322,6 +322,9 @@ int orinoco_change_mtu(struct net_device\n- {\n- \tstruct orinoco_private *priv = ndev_priv(dev);\n- \n-+\tif ((new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU))\n-+\t\treturn -EINVAL;\n-+\n- \t/* MTU + encapsulation + header length */\n- \tif ((new_mtu + ENCAPS_OVERHEAD + sizeof(struct ieee80211_hdr)) >\n- \t (priv->nicbuf_size - ETH_HLEN))\n-@@ -2285,9 +2288,6 @@ int orinoco_if_add(struct orinoco_privat\n- \tdev->base_addr = base_addr;\n- \tdev->irq = irq;\n- \n--\tdev->min_mtu = ORINOCO_MIN_MTU;\n--\tdev->max_mtu = ORINOCO_MAX_MTU;\n--\n- \tSET_NETDEV_DEV(dev, priv->dev);\n- \tret = register_netdev(dev);\n- \tif (ret)\ndiff --git a/package/kernel/mac80211/patches/010-disable_rfkill.patch b/package/kernel/mac80211/patches/010-disable_rfkill.patch\nindex 2902e498d8..d5253063ce 100644\n--- a/package/kernel/mac80211/patches/010-disable_rfkill.patch\n+++ b/package/kernel/mac80211/patches/010-disable_rfkill.patch\n@@ -10,6 +10,6 @@\n +#undef CONFIG_RFKILL_MODULE\n +#undef CONFIG_RFKILL_FULL_MODULE\n +\n- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)\n+ #if LINUX_VERSION_IS_GEQ(3,10,0)\n #include_next \n #else\ndiff --git a/package/kernel/mac80211/patches/011-backport_strscpy.patch b/package/kernel/mac80211/patches/011-backport_strscpy.patch\ndeleted file mode 100644\nindex c8e26c46f2..0000000000\n--- a/package/kernel/mac80211/patches/011-backport_strscpy.patch\n+++ /dev/null\n@@ -1,43 +0,0 @@\n---- a/backport-include/linux/string.h\n-+++ b/backport-include/linux/string.h\n-@@ -25,4 +25,8 @@ extern void *memdup_user_nul(const void\n- void memzero_explicit(void *s, size_t count);\n- #endif\n- \n-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0))\n-+ssize_t strscpy(char *dest, const char *src, size_t count);\n-+#endif\n-+\n- #endif /* __BACKPORT_LINUX_STRING_H */\n---- a/compat/backport-4.3.c\n-+++ b/compat/backport-4.3.c\n-@@ -57,3 +57,29 @@ void seq_hex_dump(struct seq_file *m, co\n- \t}\n- }\n- EXPORT_SYMBOL_GPL(seq_hex_dump);\n-+\n-+ssize_t strscpy(char *dest, const char *src, size_t count)\n-+{\n-+\tlong res = 0;\n-+\n-+\tif (count == 0)\n-+\t\treturn -E2BIG;\n-+\n-+\twhile (count) {\n-+\t\tchar c;\n-+\n-+\t\tc = src[res];\n-+\t\tdest[res] = c;\n-+\t\tif (!c)\n-+\t\t\treturn res;\n-+\t\tres++;\n-+\t\tcount--;\n-+\t}\n-+\n-+\t/* Hit buffer length without finding a NUL; force NUL-termination. */\n-+\tif (res)\n-+\t\tdest[res-1] = '\\0';\n-+\n-+\treturn -E2BIG;\n-+}\n-+EXPORT_SYMBOL_GPL(strscpy);\ndiff --git a/package/kernel/mac80211/patches/015-ipw200-mtu.patch b/package/kernel/mac80211/patches/015-ipw200-mtu.patch\nnew file mode 100644\nindex 0000000000..332ea1d679\n--- /dev/null\n+++ b/package/kernel/mac80211/patches/015-ipw200-mtu.patch\n@@ -0,0 +1,34 @@\n+--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c\n++++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c\n+@@ -11505,6 +11505,15 @@ static struct attribute_group ipw_attrib\n+ \t.attrs = ipw_sysfs_entries,\n+ };\n+ \n++#if LINUX_VERSION_IS_LESS(4,10,0)\n++static int __change_mtu(struct net_device *ndev, int new_mtu){\n++\tif (new_mtu < 68 || new_mtu > LIBIPW_DATA_LEN)\n++\t\treturn -EINVAL;\n++\tndev->mtu = new_mtu;\n++\treturn 0;\n++}\n++#endif\n++\n+ #ifdef CPTCFG_IPW2200_PROMISCUOUS\n+ static int ipw_prom_open(struct net_device *dev)\n+ {\n+@@ -11553,15 +11562,6 @@ static netdev_tx_t ipw_prom_hard_start_x\n+ \treturn NETDEV_TX_OK;\n+ }\n+ \n+-#if LINUX_VERSION_IS_LESS(4,10,0)\n+-static int __change_mtu(struct net_device *ndev, int new_mtu){\n+-\tif (new_mtu < 68 || new_mtu > LIBIPW_DATA_LEN)\n+-\t\treturn -EINVAL;\n+-\tndev->mtu = new_mtu;\n+-\treturn 0;\n+-}\n+-#endif\n+-\n+ static const struct net_device_ops ipw_prom_netdev_ops = {\n+ #if LINUX_VERSION_IS_LESS(4,10,0)\n+ \t.ndo_change_mtu = __change_mtu,\ndiff --git a/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch b/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch\ndeleted file mode 100644\nindex cf551fde02..0000000000\n--- a/package/kernel/mac80211/patches/020-01-rt2x00-avoid-introducing-a-USB-dependency-in-the-rt2.patch\n+++ /dev/null\n@@ -1,78 +0,0 @@\n-From 6232c17438ed01f43665197db5a98a4a4f77ef47 Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Thu, 2 Feb 2017 10:57:40 +0100\n-Subject: [PATCH 01/19] rt2x00: avoid introducing a USB dependency in the\n- rt2x00lib module\n-\n-As reported by Felix:\n-\n-Though protected by an ifdef, introducing an usb symbol dependency in\n-the rt2x00lib module is a major inconvenience for distributions that\n-package kernel modules split into individual packages.\n-\n-Get rid of this unnecessary dependency by calling the usb related\n-function from a more suitable place.\n-\n-Cc: Vishal Thanki \n-Reported-by: Felix Fietkau \n-Fixes: 8b4c0009313f (\"rt2x00usb: Use usb anchor to manage URB\")\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 23 ++++++++---------------\n- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 5 +++++\n- 2 files changed, 13 insertions(+), 15 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -1436,21 +1436,6 @@ void rt2x00lib_remove_dev(struct rt2x00_\n- \tcancel_work_sync(&rt2x00dev->intf_work);\n- \tcancel_delayed_work_sync(&rt2x00dev->autowakeup_work);\n- \tcancel_work_sync(&rt2x00dev->sleep_work);\n--#if IS_ENABLED(CPTCFG_RT2X00_LIB_USB)\n--\tif (rt2x00_is_usb(rt2x00dev)) {\n--\t\tusb_kill_anchored_urbs(rt2x00dev->anchor);\n--\t\thrtimer_cancel(&rt2x00dev->txstatus_timer);\n--\t\tcancel_work_sync(&rt2x00dev->rxdone_work);\n--\t\tcancel_work_sync(&rt2x00dev->txdone_work);\n--\t}\n--#endif\n--\tif (rt2x00dev->workqueue)\n--\t\tdestroy_workqueue(rt2x00dev->workqueue);\n--\n--\t/*\n--\t * Free the tx status fifo.\n--\t */\n--\tkfifo_free(&rt2x00dev->txstatus_fifo);\n- \n- \t/*\n- \t * Kill the tx status tasklet.\n-@@ -1466,6 +1451,14 @@ void rt2x00lib_remove_dev(struct rt2x00_\n- \t */\n- \trt2x00lib_uninitialize(rt2x00dev);\n- \n-+\tif (rt2x00dev->workqueue)\n-+\t\tdestroy_workqueue(rt2x00dev->workqueue);\n-+\n-+\t/*\n-+\t * Free the tx status fifo.\n-+\t */\n-+\tkfifo_free(&rt2x00dev->txstatus_fifo);\n-+\n- \t/*\n- \t * Free extra components\n- \t */\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c\n-@@ -744,6 +744,11 @@ void rt2x00usb_uninitialize(struct rt2x0\n- {\n- \tstruct data_queue *queue;\n- \n-+\tusb_kill_anchored_urbs(rt2x00dev->anchor);\n-+\thrtimer_cancel(&rt2x00dev->txstatus_timer);\n-+\tcancel_work_sync(&rt2x00dev->rxdone_work);\n-+\tcancel_work_sync(&rt2x00dev->txdone_work);\n-+\n- \tqueue_for_each(rt2x00dev, queue)\n- \t\trt2x00usb_free_entries(queue);\n- }\ndiff --git a/package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch b/package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch\ndeleted file mode 100644\nindex d096b64a8a..0000000000\n--- a/package/kernel/mac80211/patches/020-02-rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch\n+++ /dev/null\n@@ -1,56 +0,0 @@\n-From 93c7018ec16bb83399dd4db61c361a6d6aba0d5a Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 8 Feb 2017 12:18:09 +0100\n-Subject: [PATCH 02/19] rt2x00usb: do not anchor rx and tx urb's\n-\n-We might kill TX or RX urb during rt2x00usb_flush_entry(), what can\n-cause anchor list corruption like shown below:\n-\n-[ 2074.035633] WARNING: CPU: 2 PID: 14480 at lib/list_debug.c:33 __list_add+0xac/0xc0\n-[ 2074.035634] list_add corruption. prev->next should be next (ffff88020f362c28), but was dead000000000100. (prev=ffff8801d161bb70).\n-\n-[ 2074.035670] Call Trace:\n-[ 2074.035672] [] dump_stack+0x63/0x8c\n-[ 2074.035674] [] __warn+0xd1/0xf0\n-[ 2074.035676] [] warn_slowpath_fmt+0x5f/0x80\n-[ 2074.035678] [] ? rt2x00usb_register_write_lock+0x3d/0x60 [rt2800usb]\n-[ 2074.035679] [] __list_add+0xac/0xc0\n-[ 2074.035681] [] usb_anchor_urb+0x4c/0xa0\n-[ 2074.035683] [] rt2x00usb_kick_rx_entry+0xaf/0x100 [rt2x00usb]\n-[ 2074.035684] [] rt2x00usb_clear_entry+0x22/0x30 [rt2x00usb]\n-\n-To fix do not anchor TX and RX urb's, it is not needed as during\n-shutdown we kill those urbs in rt2x00usb_free_entries().\n-\n-Cc: Vishal Thanki \n-Fixes: 8b4c0009313f (\"rt2x00usb: Use usb anchor to manage URB\")\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 ----\n- 1 file changed, 4 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c\n-@@ -319,10 +319,8 @@ static bool rt2x00usb_kick_tx_entry(stru\n- \t\t\t entry->skb->data, length,\n- \t\t\t rt2x00usb_interrupt_txdone, entry);\n- \n--\tusb_anchor_urb(entry_priv->urb, rt2x00dev->anchor);\n- \tstatus = usb_submit_urb(entry_priv->urb, GFP_ATOMIC);\n- \tif (status) {\n--\t\tusb_unanchor_urb(entry_priv->urb);\n- \t\tif (status == -ENODEV)\n- \t\t\tclear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);\n- \t\tset_bit(ENTRY_DATA_IO_FAILED, &entry->flags);\n-@@ -410,10 +408,8 @@ static bool rt2x00usb_kick_rx_entry(stru\n- \t\t\t entry->skb->data, entry->skb->len,\n- \t\t\t rt2x00usb_interrupt_rxdone, entry);\n- \n--\tusb_anchor_urb(entry_priv->urb, rt2x00dev->anchor);\n- \tstatus = usb_submit_urb(entry_priv->urb, GFP_ATOMIC);\n- \tif (status) {\n--\t\tusb_unanchor_urb(entry_priv->urb);\n- \t\tif (status == -ENODEV)\n- \t\t\tclear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);\n- \t\tset_bit(ENTRY_DATA_IO_FAILED, &entry->flags);\ndiff --git a/package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch b/package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch\ndeleted file mode 100644\nindex 5ff73df2a6..0000000000\n--- a/package/kernel/mac80211/patches/020-03-rt2x00usb-fix-anchor-initialization.patch\n+++ /dev/null\n@@ -1,70 +0,0 @@\n-From 0488a6121dfe6cbd44de15ea3627913b7549a1e9 Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 8 Feb 2017 12:18:10 +0100\n-Subject: [PATCH 03/19] rt2x00usb: fix anchor initialization\n-\n-If device fail to initialize we can OOPS in rt2x00lib_remove_dev(), due\n-to using uninitialized usb_anchor structure:\n-\n-[ 855.435820] ieee80211 phy3: rt2x00usb_vendor_request: Error - Vendor Request 0x07 failed for offset 0x1000 with error -19\n-[ 855.435826] ieee80211 phy3: rt2800_probe_rt: Error - Invalid RT chipset 0x0000, rev 0000 detected\n-[ 855.435829] ieee80211 phy3: rt2x00lib_probe_dev: Error - Failed to allocate device\n-[ 855.435845] BUG: unable to handle kernel NULL pointer dereference at 0000000000000028\n-[ 855.435900] IP: _raw_spin_lock_irq+0xd/0x30\n-[ 855.435926] PGD 0\n-[ 855.435953] Oops: 0002 [#1] SMP\n-\n-[ 855.437011] Call Trace:\n-[ 855.437029] ? usb_kill_anchored_urbs+0x27/0xc0\n-[ 855.437061] rt2x00lib_remove_dev+0x190/0x1c0 [rt2x00lib]\n-[ 855.437097] rt2x00lib_probe_dev+0x246/0x7a0 [rt2x00lib]\n-[ 855.437149] ? ieee80211_roc_setup+0x9e/0xd0 [mac80211]\n-[ 855.437183] ? __kmalloc+0x1af/0x1f0\n-[ 855.437207] ? rt2x00usb_probe+0x13d/0xc50 [rt2x00usb]\n-[ 855.437240] rt2x00usb_probe+0x155/0xc50 [rt2x00usb]\n-[ 855.437273] rt2800usb_probe+0x15/0x20 [rt2800usb]\n-[ 855.437304] usb_probe_interface+0x159/0x2d0\n-[ 855.437333] driver_probe_device+0x2bb/0x460\n-\n-Patch changes initialization sequence to fix the problem.\n-\n-Cc: Vishal Thanki \n-Fixes: 8b4c0009313f (\"rt2x00usb: Use usb anchor to manage URB\")\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 13 ++++++++-----\n- 1 file changed, 8 insertions(+), 5 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c\n-@@ -825,10 +825,6 @@ int rt2x00usb_probe(struct usb_interface\n- \tif (retval)\n- \t\tgoto exit_free_device;\n- \n--\tretval = rt2x00lib_probe_dev(rt2x00dev);\n--\tif (retval)\n--\t\tgoto exit_free_reg;\n--\n- \trt2x00dev->anchor = devm_kmalloc(&usb_dev->dev,\n- \t\t\t\t\tsizeof(struct usb_anchor),\n- \t\t\t\t\tGFP_KERNEL);\n-@@ -836,10 +832,17 @@ int rt2x00usb_probe(struct usb_interface\n- \t\tretval = -ENOMEM;\n- \t\tgoto exit_free_reg;\n- \t}\n--\n- \tinit_usb_anchor(rt2x00dev->anchor);\n-+\n-+\tretval = rt2x00lib_probe_dev(rt2x00dev);\n-+\tif (retval)\n-+\t\tgoto exit_free_anchor;\n-+\n- \treturn 0;\n- \n-+exit_free_anchor:\n-+\tusb_kill_anchored_urbs(rt2x00dev->anchor);\n-+\n- exit_free_reg:\n- \trt2x00usb_free_reg(rt2x00dev);\n- \ndiff --git a/package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch b/package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch\ndeleted file mode 100644\nindex 274d8f7c3f..0000000000\n--- a/package/kernel/mac80211/patches/020-04-rt61pci-use-entry-directly.patch\n+++ /dev/null\n@@ -1,23 +0,0 @@\n-From 80a97eae304631f57ff8560f87c0b18b95321443 Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 8 Feb 2017 13:51:29 +0100\n-Subject: [PATCH 04/19] rt61pci: use entry directly\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt61pci.c | 3 +--\n- 1 file changed, 1 insertion(+), 2 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c\n-@@ -1903,8 +1903,7 @@ static void rt61pci_write_tx_desc(struct\n- \n- \trt2x00_desc_read(txd, 5, &word);\n- \trt2x00_set_field32(&word, TXD_W5_PID_TYPE, entry->queue->qid);\n--\trt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE,\n--\t\t\t skbdesc->entry->entry_idx);\n-+\trt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE, entry->entry_idx);\n- \trt2x00_set_field32(&word, TXD_W5_TX_POWER,\n- \t\t\t TXPOWER_TO_DEV(entry->queue->rt2x00dev->tx_power));\n- \trt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);\ndiff --git a/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch b/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch\ndeleted file mode 100644\nindex 241c1127bc..0000000000\n--- a/package/kernel/mac80211/patches/020-05-rt2x00-call-entry-directly-in-rt2x00_dump_frame.patch\n+++ /dev/null\n@@ -1,158 +0,0 @@\n-From 2ceb813798e1fd33e71a574771828c0f298e077b Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 8 Feb 2017 13:51:30 +0100\n-Subject: [PATCH 05/19] rt2x00: call entry directly in rt2x00_dump_frame\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 ++--\n- drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 7 ++++---\n- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 4 ++--\n- drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt61pci.c | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt73usb.c | 2 +-\n- 10 files changed, 15 insertions(+), 14 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c\n-@@ -1200,7 +1200,7 @@ static void rt2400pci_write_beacon(struc\n- \t/*\n- \t * Dump beacon to userspace through debugfs.\n- \t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);\n- out:\n- \t/*\n- \t * Enable beaconing again.\n---- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c\n-@@ -1349,7 +1349,7 @@ static void rt2500pci_write_beacon(struc\n- \t/*\n- \t * Dump beacon to userspace through debugfs.\n- \t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);\n- out:\n- \t/*\n- \t * Enable beaconing again.\n---- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c\n-@@ -1170,7 +1170,7 @@ static void rt2500usb_write_beacon(struc\n- \t/*\n- \t * Dump beacon to userspace through debugfs.\n- \t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);\n- \n- \t/*\n- \t * USB devices cannot blindly pass the skb->len as the\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -1014,7 +1014,7 @@ void rt2800_write_beacon(struct queue_en\n- \t/*\n- \t * Dump beacon to userspace through debugfs.\n- \t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);\n- \n- \t/*\n- \t * Write entire beacon with TXWI and padding to register.\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-@@ -1400,11 +1400,11 @@ void rt2x00queue_flush_queues(struct rt2\n- */\n- #ifdef CPTCFG_RT2X00_LIB_DEBUGFS\n- void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,\n--\t\t\t enum rt2x00_dump_type type, struct sk_buff *skb);\n-+\t\t\t enum rt2x00_dump_type type, struct queue_entry *entry);\n- #else\n- static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,\n- \t\t\t\t\t enum rt2x00_dump_type type,\n--\t\t\t\t\t struct sk_buff *skb)\n-+\t\t\t\t\t struct queue_entry *entry)\n- {\n- }\n- #endif /* CPTCFG_RT2X00_LIB_DEBUGFS */\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c\n-@@ -157,9 +157,10 @@ void rt2x00debug_update_crypto(struct rt\n- }\n- \n- void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,\n--\t\t\t enum rt2x00_dump_type type, struct sk_buff *skb)\n-+\t\t\t enum rt2x00_dump_type type, struct queue_entry *entry)\n- {\n- \tstruct rt2x00debug_intf *intf = rt2x00dev->debugfs_intf;\n-+\tstruct sk_buff *skb = entry->skb;\n- \tstruct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);\n- \tstruct sk_buff *skbcopy;\n- \tstruct rt2x00dump_hdr *dump_hdr;\n-@@ -196,8 +197,8 @@ void rt2x00debug_dump_frame(struct rt2x0\n- \tdump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);\n- \tdump_hdr->chip_rev = cpu_to_le16(rt2x00dev->chip.rev);\n- \tdump_hdr->type = cpu_to_le16(type);\n--\tdump_hdr->queue_index = skbdesc->entry->queue->qid;\n--\tdump_hdr->entry_index = skbdesc->entry->entry_idx;\n-+\tdump_hdr->queue_index = entry->queue->qid;\n-+\tdump_hdr->entry_index = entry->entry_idx;\n- \tdump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);\n- \tdump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);\n- \n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -363,7 +363,7 @@ void rt2x00lib_txdone(struct queue_entry\n- \t * Send frame to debugfs immediately, after this call is completed\n- \t * we are going to overwrite the skb->cb array.\n- \t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry);\n- \n- \t/*\n- \t * Determine if the frame has been successfully transmitted and\n-@@ -772,7 +772,7 @@ void rt2x00lib_rxdone(struct queue_entry\n- \t */\n- \trt2x00link_update_stats(rt2x00dev, entry->skb, &rxdesc);\n- \trt2x00debug_update_crypto(rt2x00dev, &rxdesc);\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_RXDONE, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_RXDONE, entry);\n- \n- \t/*\n- \t * Initialize RX status information, and send frame\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c\n-@@ -544,7 +544,7 @@ static void rt2x00queue_write_tx_descrip\n- \t * All processing on the frame has been completed, this means\n- \t * it is now ready to be dumped to userspace through debugfs.\n- \t */\n--\trt2x00debug_dump_frame(queue->rt2x00dev, DUMP_FRAME_TX, entry->skb);\n-+\trt2x00debug_dump_frame(queue->rt2x00dev, DUMP_FRAME_TX, entry);\n- }\n- \n- static void rt2x00queue_kick_tx_queue(struct data_queue *queue,\n---- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c\n-@@ -1988,7 +1988,7 @@ static void rt61pci_write_beacon(struct\n- \t/*\n- \t * Dump beacon to userspace through debugfs.\n- \t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);\n- \n- \t/*\n- \t * Write entire beacon with descriptor and padding to register.\n---- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c\n-@@ -1557,7 +1557,7 @@ static void rt73usb_write_beacon(struct\n- \t/*\n- \t * Dump beacon to userspace through debugfs.\n- \t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry);\n- \n- \t/*\n- \t * Write entire beacon with descriptor and padding to register.\ndiff --git a/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch b/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch\ndeleted file mode 100644\nindex c2ef9c1bb0..0000000000\n--- a/package/kernel/mac80211/patches/020-06-rt2x00-remove-queue_entry-from-skbdesc.patch\n+++ /dev/null\n@@ -1,52 +0,0 @@\n-From cf81db30a6edcca791b1bfa5348a162471121d11 Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 8 Feb 2017 13:51:31 +0100\n-Subject: [PATCH 06/19] rt2x00: remove queue_entry from skbdesc\n-\n-queue_entry field of skbdesc is not read any more, remove it to allow\n-skbdesc contain other data.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 3 ---\n- drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 2 --\n- 2 files changed, 5 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c\n-@@ -83,7 +83,6 @@ struct sk_buff *rt2x00queue_alloc_rxskb(\n- \t */\n- \tskbdesc = get_skb_frame_desc(skb);\n- \tmemset(skbdesc, 0, sizeof(*skbdesc));\n--\tskbdesc->entry = entry;\n- \n- \tif (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_DMA)) {\n- \t\tdma_addr_t skb_dma;\n-@@ -689,7 +688,6 @@ int rt2x00queue_write_tx_frame(struct da\n- \t\tgoto out;\n- \t}\n- \n--\tskbdesc->entry = entry;\n- \tentry->skb = skb;\n- \n- \t/*\n-@@ -774,7 +772,6 @@ int rt2x00queue_update_beacon(struct rt2\n- \t */\n- \tskbdesc = get_skb_frame_desc(intf->beacon->skb);\n- \tmemset(skbdesc, 0, sizeof(*skbdesc));\n--\tskbdesc->entry = intf->beacon;\n- \n- \t/*\n- \t * Send beacon to hardware.\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h\n-@@ -116,8 +116,6 @@ struct skb_frame_desc {\n- \t__le32 iv[2];\n- \n- \tdma_addr_t skb_dma;\n--\n--\tstruct queue_entry *entry;\n- };\n- \n- /**\ndiff --git a/package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch b/package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch\ndeleted file mode 100644\nindex 65496ca467..0000000000\n--- a/package/kernel/mac80211/patches/020-07-rt2500usb-don-t-mark-register-accesses-as-inline.patch\n+++ /dev/null\n@@ -1,79 +0,0 @@\n-From 7272416609126e8910b7f0d0e3dba008aa87830c Mon Sep 17 00:00:00 2001\n-From: Arnd Bergmann \n-Date: Tue, 14 Feb 2017 22:28:33 +0100\n-Subject: [PATCH 07/19] rt2500usb: don't mark register accesses as inline\n-\n-When CONFIG_KASAN is set, we get a rather large stack here:\n-\n-drivers/net/wireless/ralink/rt2x00/rt2500usb.c: In function 'rt2500usb_set_device_state':\n-drivers/net/wireless/ralink/rt2x00/rt2500usb.c:1074:1: error: the frame size of 3032 bytes is larger than 100 bytes [-Werror=frame-larger-than=]\n-\n-If we don't force those functions to be inline, the compiler can figure this\n-out better itself and not inline the functions when doing so would be harmful,\n-reducing the stack size to a merge 256 bytes.\n-\n-Note that there is another problem that manifests in this driver, as a result\n-of the typecheck() macro causing even larger stack frames.\n-\n-Signed-off-by: Arnd Bergmann \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 19 +++++--------------\n- 1 file changed, 5 insertions(+), 14 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c\n-@@ -55,7 +55,7 @@ MODULE_PARM_DESC(nohwcrypt, \"Disable har\n- * If the csr_mutex is already held then the _lock variants must\n- * be used instead.\n- */\n--static inline void rt2500usb_register_read(struct rt2x00_dev *rt2x00dev,\n-+static void rt2500usb_register_read(struct rt2x00_dev *rt2x00dev,\n- \t\t\t\t\t const unsigned int offset,\n- \t\t\t\t\t u16 *value)\n- {\n-@@ -66,7 +66,7 @@ static inline void rt2500usb_register_re\n- \t*value = le16_to_cpu(reg);\n- }\n- \n--static inline void rt2500usb_register_read_lock(struct rt2x00_dev *rt2x00dev,\n-+static void rt2500usb_register_read_lock(struct rt2x00_dev *rt2x00dev,\n- \t\t\t\t\t\tconst unsigned int offset,\n- \t\t\t\t\t\tu16 *value)\n- {\n-@@ -77,16 +77,7 @@ static inline void rt2500usb_register_re\n- \t*value = le16_to_cpu(reg);\n- }\n- \n--static inline void rt2500usb_register_multiread(struct rt2x00_dev *rt2x00dev,\n--\t\t\t\t\t\tconst unsigned int offset,\n--\t\t\t\t\t\tvoid *value, const u16 length)\n--{\n--\trt2x00usb_vendor_request_buff(rt2x00dev, USB_MULTI_READ,\n--\t\t\t\t USB_VENDOR_REQUEST_IN, offset,\n--\t\t\t\t value, length);\n--}\n--\n--static inline void rt2500usb_register_write(struct rt2x00_dev *rt2x00dev,\n-+static void rt2500usb_register_write(struct rt2x00_dev *rt2x00dev,\n- \t\t\t\t\t const unsigned int offset,\n- \t\t\t\t\t u16 value)\n- {\n-@@ -96,7 +87,7 @@ static inline void rt2500usb_register_wr\n- \t\t\t\t ®, sizeof(reg));\n- }\n- \n--static inline void rt2500usb_register_write_lock(struct rt2x00_dev *rt2x00dev,\n-+static void rt2500usb_register_write_lock(struct rt2x00_dev *rt2x00dev,\n- \t\t\t\t\t\t const unsigned int offset,\n- \t\t\t\t\t\t u16 value)\n- {\n-@@ -106,7 +97,7 @@ static inline void rt2500usb_register_wr\n- \t\t\t\t ®, sizeof(reg), REGISTER_TIMEOUT);\n- }\n- \n--static inline void rt2500usb_register_multiwrite(struct rt2x00_dev *rt2x00dev,\n-+static void rt2500usb_register_multiwrite(struct rt2x00_dev *rt2x00dev,\n- \t\t\t\t\t\t const unsigned int offset,\n- \t\t\t\t\t\t void *value, const u16 length)\n- {\ndiff --git a/package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch b/package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch\ndeleted file mode 100644\nindex 8b61235e11..0000000000\n--- a/package/kernel/mac80211/patches/020-08-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch\n+++ /dev/null\n@@ -1,87 +0,0 @@\n-From 96609f366c6f792421e1939c5c834abbe24eb88a Mon Sep 17 00:00:00 2001\n-From: Gabor Juhos \n-Date: Wed, 15 Feb 2017 10:25:04 +0100\n-Subject: [PATCH 08/19] rt2x00: rt2800lib: move rt2800_drv_data declaration\n- into rt2800lib.h\n-\n-The rt2800_drv_data structure contains driver specific\n-information. Move the declaration into the rt2800lib.h\n-header which is a more logical place for it. Also fix\n-the comment style to avoid checkpatch warning.\n-\n-The patch contains no functional changes, it is in\n-preparation for the next patch.\n-\n-Signed-off-by: Gabor Juhos \n-Signed-off-by: Daniel Golle \n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800.h | 25 -------------------------\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 23 +++++++++++++++++++++++\n- 2 files changed, 23 insertions(+), 25 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-@@ -2987,29 +2987,4 @@ enum rt2800_eeprom_word {\n- */\n- #define BCN_TBTT_OFFSET 64\n- \n--/*\n-- * Hardware has 255 WCID table entries. First 32 entries are reserved for\n-- * shared keys. Since parts of the pairwise key table might be shared with\n-- * the beacon frame buffers 6 & 7 we could only use the first 222 entries.\n-- */\n--#define WCID_START\t33\n--#define WCID_END\t222\n--#define STA_IDS_SIZE\t(WCID_END - WCID_START + 2)\n--\n--/*\n-- * RT2800 driver data structure\n-- */\n--struct rt2800_drv_data {\n--\tu8 calibration_bw20;\n--\tu8 calibration_bw40;\n--\tu8 bbp25;\n--\tu8 bbp26;\n--\tu8 txmixer_gain_24g;\n--\tu8 txmixer_gain_5g;\n--\tu8 max_psdu;\n--\tunsigned int tbtt_tick;\n--\tunsigned int ampdu_factor_cnt[4];\n--\tDECLARE_BITMAP(sta_ids, STA_IDS_SIZE);\n--};\n--\n- #endif /* RT2800_H */\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-@@ -20,6 +20,29 @@\n- #ifndef RT2800LIB_H\n- #define RT2800LIB_H\n- \n-+/*\n-+ * Hardware has 255 WCID table entries. First 32 entries are reserved for\n-+ * shared keys. Since parts of the pairwise key table might be shared with\n-+ * the beacon frame buffers 6 & 7 we could only use the first 222 entries.\n-+ */\n-+#define WCID_START\t33\n-+#define WCID_END\t222\n-+#define STA_IDS_SIZE\t(WCID_END - WCID_START + 2)\n-+\n-+/* RT2800 driver data structure */\n-+struct rt2800_drv_data {\n-+\tu8 calibration_bw20;\n-+\tu8 calibration_bw40;\n-+\tu8 bbp25;\n-+\tu8 bbp26;\n-+\tu8 txmixer_gain_24g;\n-+\tu8 txmixer_gain_5g;\n-+\tu8 max_psdu;\n-+\tunsigned int tbtt_tick;\n-+\tunsigned int ampdu_factor_cnt[4];\n-+\tDECLARE_BITMAP(sta_ids, STA_IDS_SIZE);\n-+};\n-+\n- struct rt2800_ops {\n- \tvoid (*register_read)(struct rt2x00_dev *rt2x00dev,\n- \t\t\t const unsigned int offset, u32 *value);\ndiff --git a/package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch b/package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch\ndeleted file mode 100644\nindex 922c35833c..0000000000\n--- a/package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch\n+++ /dev/null\n@@ -1,85 +0,0 @@\n-From a13d985f26f6df07d5c5c0e190477628e236babc Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:05 +0100\n-Subject: [PATCH 09/19] rt2800: identify station based on status WCID\n-\n-Add framework to identify sta based on tx status WCID. This is currently\n-not used, will start be utilized in the future patch.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 +++++\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 1 +\n- drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 3 ++-\n- 3 files changed, 8 insertions(+), 1 deletion(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -855,11 +855,13 @@ EXPORT_SYMBOL_GPL(rt2800_process_rxwi);\n- void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi)\n- {\n- \tstruct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;\n-+\tstruct rt2800_drv_data *drv_data = rt2x00dev->drv_data;\n- \tstruct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);\n- \tstruct txdone_entry_desc txdesc;\n- \tu32 word;\n- \tu16 mcs, real_mcs;\n- \tint aggr, ampdu;\n-+\tint wcid;\n- \n- \t/*\n- \t * Obtain the status about this packet.\n-@@ -872,6 +874,7 @@ void rt2800_txdone_entry(struct queue_en\n- \n- \treal_mcs = rt2x00_get_field32(status, TX_STA_FIFO_MCS);\n- \taggr = rt2x00_get_field32(status, TX_STA_FIFO_TX_AGGRE);\n-+\twcid = rt2x00_get_field32(status, TX_STA_FIFO_WCID);\n- \n- \t/*\n- \t * If a frame was meant to be sent as a single non-aggregated MPDU\n-@@ -1468,6 +1471,7 @@ int rt2800_sta_add(struct rt2x00_dev *rt\n- \t\treturn 0;\n- \n- \t__set_bit(wcid - WCID_START, drv_data->sta_ids);\n-+\tdrv_data->wcid_to_sta[wcid - WCID_START] = sta;\n- \n- \t/*\n- \t * Clean up WCID attributes and write STA address to the device.\n-@@ -1498,6 +1502,7 @@ int rt2800_sta_remove(struct rt2x00_dev\n- \t * get renewed when the WCID is reused.\n- \t */\n- \trt2800_config_wcid(rt2x00dev, NULL, wcid);\n-+\tdrv_data->wcid_to_sta[wcid - WCID_START] = NULL;\n- \t__clear_bit(wcid - WCID_START, drv_data->sta_ids);\n- \n- \treturn 0;\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-@@ -41,6 +41,7 @@ struct rt2800_drv_data {\n- \tunsigned int tbtt_tick;\n- \tunsigned int ampdu_factor_cnt[4];\n- \tDECLARE_BITMAP(sta_ids, STA_IDS_SIZE);\n-+\tstruct ieee80211_sta *wcid_to_sta[STA_IDS_SIZE];\n- };\n- \n- struct rt2800_ops {\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h\n-@@ -102,7 +102,7 @@ enum skb_frame_desc_flags {\n- *\tof the scope of the skb->data pointer.\n- * @iv: IV/EIV data used during encryption/decryption.\n- * @skb_dma: (PCI-only) the DMA address associated with the sk buffer.\n-- * @entry: The entry to which this sk buffer belongs.\n-+ * @sta: The station where sk buffer was sent.\n- */\n- struct skb_frame_desc {\n- \tu8 flags;\n-@@ -116,6 +116,7 @@ struct skb_frame_desc {\n- \t__le32 iv[2];\n- \n- \tdma_addr_t skb_dma;\n-+\tstruct ieee80211_sta *sta;\n- };\n- \n- /**\ndiff --git a/package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch b/package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch\ndeleted file mode 100644\nindex 84f2732b22..0000000000\n--- a/package/kernel/mac80211/patches/020-10-rt2x00-separte-filling-tx-status-from-rt2x00lib_txdo.patch\n+++ /dev/null\n@@ -1,173 +0,0 @@\n-From 5edb05afebba8f488a30db29550e55c42eea6d6a Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:06 +0100\n-Subject: [PATCH 10/19] rt2x00: separte filling tx status from rt2x00lib_txdone\n-\n-This makes rt2x00lib_txdone a bit simpler and will allow to reuse code\n-in different variant of txdone which I'm preparing.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 141 +++++++++++++------------\n- 1 file changed, 76 insertions(+), 65 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -313,73 +313,14 @@ static inline int rt2x00lib_txdone_bar_s\n- \treturn ret;\n- }\n- \n--void rt2x00lib_txdone(struct queue_entry *entry,\n--\t\t struct txdone_entry_desc *txdesc)\n-+static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t struct ieee80211_tx_info *tx_info,\n-+\t\t\t\t struct skb_frame_desc *skbdesc,\n-+\t\t\t\t struct txdone_entry_desc *txdesc,\n-+\t\t\t\t bool success)\n- {\n--\tstruct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;\n--\tstruct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);\n--\tstruct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);\n--\tunsigned int header_length, i;\n- \tu8 rate_idx, rate_flags, retry_rates;\n--\tu8 skbdesc_flags = skbdesc->flags;\n--\tbool success;\n--\n--\t/*\n--\t * Unmap the skb.\n--\t */\n--\trt2x00queue_unmap_skb(entry);\n--\n--\t/*\n--\t * Remove the extra tx headroom from the skb.\n--\t */\n--\tskb_pull(entry->skb, rt2x00dev->extra_tx_headroom);\n--\n--\t/*\n--\t * Signal that the TX descriptor is no longer in the skb.\n--\t */\n--\tskbdesc->flags &= ~SKBDESC_DESC_IN_SKB;\n--\n--\t/*\n--\t * Determine the length of 802.11 header.\n--\t */\n--\theader_length = ieee80211_get_hdrlen_from_skb(entry->skb);\n--\n--\t/*\n--\t * Remove L2 padding which was added during\n--\t */\n--\tif (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_L2PAD))\n--\t\trt2x00queue_remove_l2pad(entry->skb, header_length);\n--\n--\t/*\n--\t * If the IV/EIV data was stripped from the frame before it was\n--\t * passed to the hardware, we should now reinsert it again because\n--\t * mac80211 will expect the same data to be present it the\n--\t * frame as it was passed to us.\n--\t */\n--\tif (rt2x00_has_cap_hw_crypto(rt2x00dev))\n--\t\trt2x00crypto_tx_insert_iv(entry->skb, header_length);\n--\n--\t/*\n--\t * Send frame to debugfs immediately, after this call is completed\n--\t * we are going to overwrite the skb->cb array.\n--\t */\n--\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry);\n--\n--\t/*\n--\t * Determine if the frame has been successfully transmitted and\n--\t * remove BARs from our check list while checking for their\n--\t * TX status.\n--\t */\n--\tsuccess =\n--\t rt2x00lib_txdone_bar_status(entry) ||\n--\t test_bit(TXDONE_SUCCESS, &txdesc->flags) ||\n--\t test_bit(TXDONE_UNKNOWN, &txdesc->flags);\n--\n--\t/*\n--\t * Update TX statistics.\n--\t */\n--\trt2x00dev->link.qual.tx_success += success;\n--\trt2x00dev->link.qual.tx_failed += !success;\n-+\tint i;\n- \n- \trate_idx = skbdesc->tx_rate_idx;\n- \trate_flags = skbdesc->tx_rate_flags;\n-@@ -448,6 +389,76 @@ void rt2x00lib_txdone(struct queue_entry\n- \t\telse\n- \t\t\trt2x00dev->low_level_stats.dot11RTSFailureCount++;\n- \t}\n-+}\n-+\n-+void rt2x00lib_txdone(struct queue_entry *entry,\n-+\t\t struct txdone_entry_desc *txdesc)\n-+{\n-+\tstruct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;\n-+\tstruct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);\n-+\tstruct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);\n-+\tu8 skbdesc_flags = skbdesc->flags;\n-+\tunsigned int header_length;\n-+\tbool success;\n-+\n-+\t/*\n-+\t * Unmap the skb.\n-+\t */\n-+\trt2x00queue_unmap_skb(entry);\n-+\n-+\t/*\n-+\t * Remove the extra tx headroom from the skb.\n-+\t */\n-+\tskb_pull(entry->skb, rt2x00dev->extra_tx_headroom);\n-+\n-+\t/*\n-+\t * Signal that the TX descriptor is no longer in the skb.\n-+\t */\n-+\tskbdesc->flags &= ~SKBDESC_DESC_IN_SKB;\n-+\n-+\t/*\n-+\t * Determine the length of 802.11 header.\n-+\t */\n-+\theader_length = ieee80211_get_hdrlen_from_skb(entry->skb);\n-+\n-+\t/*\n-+\t * Remove L2 padding which was added during\n-+\t */\n-+\tif (rt2x00_has_cap_flag(rt2x00dev, REQUIRE_L2PAD))\n-+\t\trt2x00queue_remove_l2pad(entry->skb, header_length);\n-+\n-+\t/*\n-+\t * If the IV/EIV data was stripped from the frame before it was\n-+\t * passed to the hardware, we should now reinsert it again because\n-+\t * mac80211 will expect the same data to be present it the\n-+\t * frame as it was passed to us.\n-+\t */\n-+\tif (rt2x00_has_cap_hw_crypto(rt2x00dev))\n-+\t\trt2x00crypto_tx_insert_iv(entry->skb, header_length);\n-+\n-+\t/*\n-+\t * Send frame to debugfs immediately, after this call is completed\n-+\t * we are going to overwrite the skb->cb array.\n-+\t */\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry);\n-+\n-+\t/*\n-+\t * Determine if the frame has been successfully transmitted and\n-+\t * remove BARs from our check list while checking for their\n-+\t * TX status.\n-+\t */\n-+\tsuccess =\n-+\t rt2x00lib_txdone_bar_status(entry) ||\n-+\t test_bit(TXDONE_SUCCESS, &txdesc->flags) ||\n-+\t test_bit(TXDONE_UNKNOWN, &txdesc->flags);\n-+\n-+\t/*\n-+\t * Update TX statistics.\n-+\t */\n-+\trt2x00dev->link.qual.tx_success += success;\n-+\trt2x00dev->link.qual.tx_failed += !success;\n-+\n-+\trt2x00lib_fill_tx_status(rt2x00dev, tx_info, skbdesc, txdesc, success);\n- \n- \t/*\n- \t * Only send the status report to mac80211 when it's a frame\ndiff --git a/package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch b/package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch\ndeleted file mode 100644\nindex e1359397ba..0000000000\n--- a/package/kernel/mac80211/patches/020-11-rt2x00-separte-clearing-entry-from-rt2x00lib_txdone.patch\n+++ /dev/null\n@@ -1,83 +0,0 @@\n-From 56646adf9cd60b488ddc5633a2d9aa1f30efa5db Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:07 +0100\n-Subject: [PATCH 11/19] rt2x00: separte clearing entry from rt2x00lib_txdone\n-\n-This makes rt2x00lib_txdone a bit simpler and will allow to reuse\n-code in different variant of txdone which I'm preparing.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 51 +++++++++++++++-----------\n- 1 file changed, 29 insertions(+), 22 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -391,6 +391,32 @@ static void rt2x00lib_fill_tx_status(str\n- \t}\n- }\n- \n-+static void rt2x00lib_clear_entry(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t struct queue_entry *entry)\n-+{\n-+\t/*\n-+\t * Make this entry available for reuse.\n-+\t */\n-+\tentry->skb = NULL;\n-+\tentry->flags = 0;\n-+\n-+\trt2x00dev->ops->lib->clear_entry(entry);\n-+\n-+\trt2x00queue_index_inc(entry, Q_INDEX_DONE);\n-+\n-+\t/*\n-+\t * If the data queue was below the threshold before the txdone\n-+\t * handler we must make sure the packet queue in the mac80211 stack\n-+\t * is reenabled when the txdone handler has finished. This has to be\n-+\t * serialized with rt2x00mac_tx(), otherwise we can wake up queue\n-+\t * before it was stopped.\n-+\t */\n-+\tspin_lock_bh(&entry->queue->tx_lock);\n-+\tif (!rt2x00queue_threshold(entry->queue))\n-+\t\trt2x00queue_unpause_queue(entry->queue);\n-+\tspin_unlock_bh(&entry->queue->tx_lock);\n-+}\n-+\n- void rt2x00lib_txdone(struct queue_entry *entry,\n- \t\t struct txdone_entry_desc *txdesc)\n- {\n-@@ -471,30 +497,11 @@ void rt2x00lib_txdone(struct queue_entry\n- \t\t\tieee80211_tx_status(rt2x00dev->hw, entry->skb);\n- \t\telse\n- \t\t\tieee80211_tx_status_ni(rt2x00dev->hw, entry->skb);\n--\t} else\n-+\t} else {\n- \t\tdev_kfree_skb_any(entry->skb);\n-+\t}\n- \n--\t/*\n--\t * Make this entry available for reuse.\n--\t */\n--\tentry->skb = NULL;\n--\tentry->flags = 0;\n--\n--\trt2x00dev->ops->lib->clear_entry(entry);\n--\n--\trt2x00queue_index_inc(entry, Q_INDEX_DONE);\n--\n--\t/*\n--\t * If the data queue was below the threshold before the txdone\n--\t * handler we must make sure the packet queue in the mac80211 stack\n--\t * is reenabled when the txdone handler has finished. This has to be\n--\t * serialized with rt2x00mac_tx(), otherwise we can wake up queue\n--\t * before it was stopped.\n--\t */\n--\tspin_lock_bh(&entry->queue->tx_lock);\n--\tif (!rt2x00queue_threshold(entry->queue))\n--\t\trt2x00queue_unpause_queue(entry->queue);\n--\tspin_unlock_bh(&entry->queue->tx_lock);\n-+\trt2x00lib_clear_entry(rt2x00dev, entry);\n- }\n- EXPORT_SYMBOL_GPL(rt2x00lib_txdone);\n- \ndiff --git a/package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch b/package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch\ndeleted file mode 100644\nindex 60edb08e75..0000000000\n--- a/package/kernel/mac80211/patches/020-12-rt2x00-add-txdone-nomatch-function.patch\n+++ /dev/null\n@@ -1,85 +0,0 @@\n-From a09305d052166cb489402a63a5d275e954e0b923 Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:08 +0100\n-Subject: [PATCH 12/19] rt2x00: add txdone nomatch function\n-\n-This txdone nomatch function will be used when we get status from the HW,\n-but we could not match it with any sent skb.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 ++\n- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 50 ++++++++++++++++++++++++++\n- 2 files changed, 52 insertions(+)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-@@ -1425,6 +1425,8 @@ void rt2x00lib_dmastart(struct queue_ent\n- void rt2x00lib_dmadone(struct queue_entry *entry);\n- void rt2x00lib_txdone(struct queue_entry *entry,\n- \t\t struct txdone_entry_desc *txdesc);\n-+void rt2x00lib_txdone_nomatch(struct queue_entry *entry,\n-+\t\t\t struct txdone_entry_desc *txdesc);\n- void rt2x00lib_txdone_noinfo(struct queue_entry *entry, u32 status);\n- void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp);\n- \n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -417,6 +417,56 @@ static void rt2x00lib_clear_entry(struct\n- \tspin_unlock_bh(&entry->queue->tx_lock);\n- }\n- \n-+void rt2x00lib_txdone_nomatch(struct queue_entry *entry,\n-+\t\t\t struct txdone_entry_desc *txdesc)\n-+{\n-+\tstruct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;\n-+\tstruct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);\n-+\tstruct ieee80211_tx_info txinfo = {};\n-+\tbool success;\n-+\n-+\t/*\n-+\t * Unmap the skb.\n-+\t */\n-+\trt2x00queue_unmap_skb(entry);\n-+\n-+\t/*\n-+\t * Signal that the TX descriptor is no longer in the skb.\n-+\t */\n-+\tskbdesc->flags &= ~SKBDESC_DESC_IN_SKB;\n-+\n-+\t/*\n-+\t * Send frame to debugfs immediately, after this call is completed\n-+\t * we are going to overwrite the skb->cb array.\n-+\t */\n-+\trt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry);\n-+\n-+\t/*\n-+\t * Determine if the frame has been successfully transmitted and\n-+\t * remove BARs from our check list while checking for their\n-+\t * TX status.\n-+\t */\n-+\tsuccess =\n-+\t rt2x00lib_txdone_bar_status(entry) ||\n-+\t test_bit(TXDONE_SUCCESS, &txdesc->flags);\n-+\n-+\tif (!test_bit(TXDONE_UNKNOWN, &txdesc->flags)) {\n-+\t\t/*\n-+\t\t * Update TX statistics.\n-+\t\t */\n-+\t\trt2x00dev->link.qual.tx_success += success;\n-+\t\trt2x00dev->link.qual.tx_failed += !success;\n-+\n-+\t\trt2x00lib_fill_tx_status(rt2x00dev, &txinfo, skbdesc, txdesc,\n-+\t\t\t\t\t success);\n-+\t\tieee80211_tx_status_noskb(rt2x00dev->hw, skbdesc->sta, &txinfo);\n-+\t}\n-+\n-+\tdev_kfree_skb_any(entry->skb);\n-+\trt2x00lib_clear_entry(rt2x00dev, entry);\n-+}\n-+EXPORT_SYMBOL_GPL(rt2x00lib_txdone_nomatch);\n-+\n- void rt2x00lib_txdone(struct queue_entry *entry,\n- \t\t struct txdone_entry_desc *txdesc)\n- {\ndiff --git a/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch b/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch\ndeleted file mode 100644\nindex a0cc37f491..0000000000\n--- a/package/kernel/mac80211/patches/020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch\n+++ /dev/null\n@@ -1,47 +0,0 @@\n-From ec80ad70d778af7665992672896633ebd3b02ac8 Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:09 +0100\n-Subject: [PATCH 13/19] rt2x00: fixup fill_tx_status for nomatch case\n-\n-Add bits rt2x00lib_fill_tx_status() when filling status in nomatch\n-case and hopefully do not break the function for existing cases.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 6 +++++-\n- drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 1 +\n- 2 files changed, 6 insertions(+), 1 deletion(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(str\n- \tif (i < (IEEE80211_TX_MAX_RATES - 1))\n- \t\ttx_info->status.rates[i].idx = -1; /* terminate */\n- \n-+\tif (test_bit(TXDONE_NO_ACK_REQ, &txdesc->flags))\n-+\t\ttx_info->flags |= IEEE80211_TX_CTL_NO_ACK;\n-+\n- \tif (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) {\n- \t\tif (success)\n- \t\t\ttx_info->flags |= IEEE80211_TX_STAT_ACK;\n-@@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(str\n- \t */\n- \tif (test_bit(TXDONE_AMPDU, &txdesc->flags) ||\n- \t tx_info->flags & IEEE80211_TX_CTL_AMPDU) {\n--\t\ttx_info->flags |= IEEE80211_TX_STAT_AMPDU;\n-+\t\ttx_info->flags |= IEEE80211_TX_STAT_AMPDU |\n-+\t\t\t\t IEEE80211_TX_CTL_AMPDU;\n- \t\ttx_info->status.ampdu_len = 1;\n- \t\ttx_info->status.ampdu_ack_len = success ? 1 : 0;\n- \n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h\n-@@ -215,6 +215,7 @@ enum txdone_entry_desc_flags {\n- \tTXDONE_FAILURE,\n- \tTXDONE_EXCESSIVE_RETRY,\n- \tTXDONE_AMPDU,\n-+\tTXDONE_NO_ACK_REQ,\n- };\n- \n- /**\ndiff --git a/package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch b/package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch\ndeleted file mode 100644\nindex 1e23ef7bcb..0000000000\n--- a/package/kernel/mac80211/patches/020-14-rt2x00-use-txdone_nomatch-on-rt2800usb.patch\n+++ /dev/null\n@@ -1,180 +0,0 @@\n-From 293dff78ee058ec1e0b90e05a803c512b6a2097f Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:10 +0100\n-Subject: [PATCH 14/19] rt2x00: use txdone_nomatch on rt2800usb\n-\n-If we do not match skb entry, provide tx status via nomatch procedure.\n-\n-Currently in that case we do rt2x00lib_txdone_noinfo(TXDONE_NOINFO),\n-which actually assume that entry->skb was posted without retries and\n-provide rate saved in skb desc as successful. Patch changed that to\n-rate read from TX_STAT_FIFO, however still do not provide correct\n-number of retries.\n-\n-On SoC/PCI devices we keep providing status via standard txdone\n-procedure, no change in those devices, though we should thing about it.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 31 ++++++++++++++++++++-----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 3 ++-\n- drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 18 ++++++--------\n- 4 files changed, 35 insertions(+), 19 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -852,7 +852,8 @@ void rt2800_process_rxwi(struct queue_en\n- }\n- EXPORT_SYMBOL_GPL(rt2800_process_rxwi);\n- \n--void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi)\n-+void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,\n-+\t\t\t bool match)\n- {\n- \tstruct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;\n- \tstruct rt2800_drv_data *drv_data = rt2x00dev->drv_data;\n-@@ -860,8 +861,7 @@ void rt2800_txdone_entry(struct queue_en\n- \tstruct txdone_entry_desc txdesc;\n- \tu32 word;\n- \tu16 mcs, real_mcs;\n--\tint aggr, ampdu;\n--\tint wcid;\n-+\tint aggr, ampdu, wcid, ack_req;\n- \n- \t/*\n- \t * Obtain the status about this packet.\n-@@ -875,6 +875,7 @@ void rt2800_txdone_entry(struct queue_en\n- \treal_mcs = rt2x00_get_field32(status, TX_STA_FIFO_MCS);\n- \taggr = rt2x00_get_field32(status, TX_STA_FIFO_TX_AGGRE);\n- \twcid = rt2x00_get_field32(status, TX_STA_FIFO_WCID);\n-+\tack_req\t= rt2x00_get_field32(status, TX_STA_FIFO_TX_ACK_REQUIRED);\n- \n- \t/*\n- \t * If a frame was meant to be sent as a single non-aggregated MPDU\n-@@ -891,8 +892,12 @@ void rt2800_txdone_entry(struct queue_en\n- \t * Hence, replace the requested rate with the real tx rate to not\n- \t * confuse the rate control algortihm by providing clearly wrong\n- \t * data.\n--\t */\n--\tif (unlikely(aggr == 1 && ampdu == 0 && real_mcs != mcs)) {\n-+\t *\n-+\t * FIXME: if we do not find matching entry, we tell that frame was\n-+\t * posted without any retries. We need to find a way to fix that\n-+\t * and provide retry count.\n-+ \t */\n-+\tif (unlikely((aggr == 1 && ampdu == 0 && real_mcs != mcs)) || !match) {\n- \t\tskbdesc->tx_rate_idx = real_mcs;\n- \t\tmcs = real_mcs;\n- \t}\n-@@ -900,6 +905,9 @@ void rt2800_txdone_entry(struct queue_en\n- \tif (aggr == 1 || ampdu == 1)\n- \t\t__set_bit(TXDONE_AMPDU, &txdesc.flags);\n- \n-+\tif (!ack_req)\n-+\t\t__set_bit(TXDONE_NO_ACK_REQ, &txdesc.flags);\n-+\n- \t/*\n- \t * Ralink has a retry mechanism using a global fallback\n- \t * table. We setup this fallback table to try the immediate\n-@@ -931,7 +939,18 @@ void rt2800_txdone_entry(struct queue_en\n- \tif (txdesc.retry)\n- \t\t__set_bit(TXDONE_FALLBACK, &txdesc.flags);\n- \n--\trt2x00lib_txdone(entry, &txdesc);\n-+\tif (!match) {\n-+\t\t/* RCU assures non-null sta will not be freed by mac80211. */\n-+\t\trcu_read_lock();\n-+\t\tif (likely(wcid >= WCID_START && wcid <= WCID_END))\n-+\t\t\tskbdesc->sta = drv_data->wcid_to_sta[wcid - WCID_START];\n-+\t\telse\n-+\t\t\tskbdesc->sta = NULL;\n-+\t\trt2x00lib_txdone_nomatch(entry, &txdesc);\n-+\t\trcu_read_unlock();\n-+\t} else {\n-+\t\trt2x00lib_txdone(entry, &txdesc);\n-+\t}\n- }\n- EXPORT_SYMBOL_GPL(rt2800_txdone_entry);\n- \n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-@@ -191,7 +191,8 @@ void rt2800_write_tx_data(struct queue_e\n- \t\t\t struct txentry_desc *txdesc);\n- void rt2800_process_rxwi(struct queue_entry *entry, struct rxdone_entry_desc *txdesc);\n- \n--void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32* txwi);\n-+void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,\n-+\t\t\t bool match);\n- \n- void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);\n- void rt2800_clear_beacon(struct queue_entry *entry);\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c\n-@@ -239,7 +239,7 @@ static bool rt2800mmio_txdone_release_en\n- {\n- \tif (test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) {\n- \t\trt2800_txdone_entry(entry, entry->status,\n--\t\t\t\t rt2800mmio_get_txwi(entry));\n-+\t\t\t\t rt2800mmio_get_txwi(entry), true);\n- \t\treturn false;\n- \t}\n- \n---- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c\n-@@ -501,8 +501,7 @@ static int rt2800usb_get_tx_data_len(str\n- /*\n- * TX control handlers\n- */\n--static enum txdone_entry_desc_flags\n--rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg)\n-+static bool rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg)\n- {\n- \t__le32 *txwi;\n- \tu32 word;\n-@@ -515,7 +514,7 @@ rt2800usb_txdone_entry_check(struct queu\n- \t * frame.\n- \t */\n- \tif (test_bit(ENTRY_DATA_IO_FAILED, &entry->flags))\n--\t\treturn TXDONE_FAILURE;\n-+\t\treturn false;\n- \n- \twcid\t= rt2x00_get_field32(reg, TX_STA_FIFO_WCID);\n- \tack\t= rt2x00_get_field32(reg, TX_STA_FIFO_TX_ACK_REQUIRED);\n-@@ -537,10 +536,10 @@ rt2800usb_txdone_entry_check(struct queu\n- \t\trt2x00_dbg(entry->queue->rt2x00dev,\n- \t\t\t \"TX status report missed for queue %d entry %d\\n\",\n- \t\t\t entry->queue->qid, entry->entry_idx);\n--\t\treturn TXDONE_UNKNOWN;\n-+\t\treturn false;\n- \t}\n- \n--\treturn TXDONE_SUCCESS;\n-+\treturn true;\n- }\n- \n- static void rt2800usb_txdone(struct rt2x00_dev *rt2x00dev)\n-@@ -549,7 +548,7 @@ static void rt2800usb_txdone(struct rt2x\n- \tstruct queue_entry *entry;\n- \tu32 reg;\n- \tu8 qid;\n--\tenum txdone_entry_desc_flags done_status;\n-+\tbool match;\n- \n- \twhile (kfifo_get(&rt2x00dev->txstatus_fifo, ®)) {\n- \t\t/*\n-@@ -574,11 +573,8 @@ static void rt2800usb_txdone(struct rt2x\n- \t\t\tbreak;\n- \t\t}\n- \n--\t\tdone_status = rt2800usb_txdone_entry_check(entry, reg);\n--\t\tif (likely(done_status == TXDONE_SUCCESS))\n--\t\t\trt2800_txdone_entry(entry, reg, rt2800usb_get_txwi(entry));\n--\t\telse\n--\t\t\trt2x00lib_txdone_noinfo(entry, done_status);\n-+\t\tmatch = rt2800usb_txdone_entry_check(entry, reg);\n-+\t\trt2800_txdone_entry(entry, reg, rt2800usb_get_txwi(entry), match);\n- \t}\n- }\n- \ndiff --git a/package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch b/package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch\ndeleted file mode 100644\nindex 37838e8895..0000000000\n--- a/package/kernel/mac80211/patches/020-15-rt2800-status-based-rate-flags-for-nomatch-case.patch\n+++ /dev/null\n@@ -1,81 +0,0 @@\n-From 9d7a7a4d2b02bcd30fb5fe4270278212353cc332 Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:11 +0100\n-Subject: [PATCH 15/19] rt2800: status based rate flags for nomatch case\n-\n-We use skb_desc->tx_rate_flags from entry as rate[].flags even if\n-skb does not match status. Patch corrects flags and also fixes\n-mcs for legacy rates.\n-\n-rt2800_rate_from_status() is based on Felix's mt76\n-mt76x2_mac_process_tx_rate() function.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800.h | 2 ++\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 35 +++++++++++++++++++++++++-\n- 2 files changed, 36 insertions(+), 1 deletion(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-@@ -1760,6 +1760,8 @@\n- #define TX_STA_FIFO_WCID\t\tFIELD32(0x0000ff00)\n- #define TX_STA_FIFO_SUCCESS_RATE\tFIELD32(0xffff0000)\n- #define TX_STA_FIFO_MCS\t\t\tFIELD32(0x007f0000)\n-+#define TX_STA_FIFO_BW\t\t\tFIELD32(0x00800000)\n-+#define TX_STA_FIFO_SGI\t\t\tFIELD32(0x01000000)\n- #define TX_STA_FIFO_PHYMODE\t\tFIELD32(0xc0000000)\n- \n- /*\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -852,6 +852,39 @@ void rt2800_process_rxwi(struct queue_en\n- }\n- EXPORT_SYMBOL_GPL(rt2800_process_rxwi);\n- \n-+static void rt2800_rate_from_status(struct skb_frame_desc *skbdesc,\n-+\t\t\t\t u32 status, enum nl80211_band band)\n-+{\n-+\tu8 flags = 0;\n-+\tu8 idx = rt2x00_get_field32(status, TX_STA_FIFO_MCS);\n-+\n-+\tswitch (rt2x00_get_field32(status, TX_STA_FIFO_PHYMODE)) {\n-+\tcase RATE_MODE_HT_GREENFIELD:\n-+\t\tflags |= IEEE80211_TX_RC_GREEN_FIELD;\n-+\t\t/* fall through */\n-+\tcase RATE_MODE_HT_MIX:\n-+\t\tflags |= IEEE80211_TX_RC_MCS;\n-+\t\tbreak;\n-+\tcase RATE_MODE_OFDM:\n-+\t\tif (band == NL80211_BAND_2GHZ)\n-+\t\t\tidx += 4;\n-+\t\tbreak;\n-+\tcase RATE_MODE_CCK:\n-+\t\tif (idx >= 8)\n-+\t\t\tidx -= 8;\n-+\t\tbreak;\n-+\t}\n-+\n-+\tif (rt2x00_get_field32(status, TX_STA_FIFO_BW))\n-+\t\tflags |= IEEE80211_TX_RC_40_MHZ_WIDTH;\n-+\n-+\tif (rt2x00_get_field32(status, TX_STA_FIFO_SGI))\n-+\t\tflags |= IEEE80211_TX_RC_SHORT_GI;\n-+\n-+\tskbdesc->tx_rate_idx = idx;\n-+\tskbdesc->tx_rate_flags = flags;\n-+}\n-+\n- void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,\n- \t\t\t bool match)\n- {\n-@@ -898,7 +931,7 @@ void rt2800_txdone_entry(struct queue_en\n- \t * and provide retry count.\n- \t */\n- \tif (unlikely((aggr == 1 && ampdu == 0 && real_mcs != mcs)) || !match) {\n--\t\tskbdesc->tx_rate_idx = real_mcs;\n-+\t\trt2800_rate_from_status(skbdesc, status, rt2x00dev->curr_band);\n- \t\tmcs = real_mcs;\n- \t}\n- \ndiff --git a/package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch b/package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch\ndeleted file mode 100644\nindex 7825810cef..0000000000\n--- a/package/kernel/mac80211/patches/020-16-rt2800-use-TXOP_BACKOFF-for-probe-frames.patch\n+++ /dev/null\n@@ -1,38 +0,0 @@\n-From fb47ada8dc3c30c8e7b415da155742b49536c61e Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:12 +0100\n-Subject: [PATCH 16/19] rt2800: use TXOP_BACKOFF for probe frames\n-\n-Even if we do not set AMPDU bit in TXWI, device still can aggregate\n-frame and send it with rate not corresponding to requested. That mean\n-we can do not sent probe frames with requested rate. To prevent that\n-use TXOP_BACKOFF for probe frames.\n-\n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 7 ++++---\n- 1 file changed, 4 insertions(+), 3 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c\n-@@ -372,15 +372,16 @@ static void rt2x00queue_create_tx_descri\n- \n- \t/*\n- \t * Determine IFS values\n--\t * - Use TXOP_BACKOFF for management frames except beacons\n-+\t * - Use TXOP_BACKOFF for probe and management frames except beacons\n- \t * - Use TXOP_SIFS for fragment bursts\n- \t * - Use TXOP_HTTXOP for everything else\n- \t *\n- \t * Note: rt2800 devices won't use CTS protection (if used)\n- \t * for frames not transmitted with TXOP_HTTXOP\n- \t */\n--\tif (ieee80211_is_mgmt(hdr->frame_control) &&\n--\t !ieee80211_is_beacon(hdr->frame_control))\n-+\tif ((ieee80211_is_mgmt(hdr->frame_control) &&\n-+\t !ieee80211_is_beacon(hdr->frame_control)) ||\n-+\t (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))\n- \t\ttxdesc->u.ht.txop = TXOP_BACKOFF;\n- \telse if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))\n- \t\ttxdesc->u.ht.txop = TXOP_SIFS;\ndiff --git a/package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch b/package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch\ndeleted file mode 100644\nindex 415bf5b2a6..0000000000\n--- a/package/kernel/mac80211/patches/020-17-rt2x00-fix-rt2x00debug_dump_frame-comment.patch\n+++ /dev/null\n@@ -1,23 +0,0 @@\n-From dd35cc0896faff5ed9d22eac9ea4a1920e2eec0c Mon Sep 17 00:00:00 2001\n-From: Stanislaw Gruszka \n-Date: Wed, 15 Feb 2017 10:25:13 +0100\n-Subject: [PATCH 17/19] rt2x00: fix rt2x00debug_dump_frame comment\n-\n-Reported-by: Jeroen Roovers \n-Signed-off-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +-\n- 1 file changed, 1 insertion(+), 1 deletion(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-@@ -1396,7 +1396,7 @@ void rt2x00queue_flush_queues(struct rt2\n- * rt2x00debug_dump_frame - Dump a frame to userspace through debugfs.\n- * @rt2x00dev: Pointer to &struct rt2x00_dev.\n- * @type: The type of frame that is being dumped.\n-- * @skb: The skb containing the frame to be dumped.\n-+ * @entry: The queue entry containing the frame to be dumped.\n- */\n- #ifdef CPTCFG_RT2X00_LIB_DEBUGFS\n- void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,\ndiff --git a/package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch b/package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch\ndeleted file mode 100644\nindex c6fb7dd2c4..0000000000\n--- a/package/kernel/mac80211/patches/020-18-rt2x00-fix-TX_PWR_CFG_4-register-definition.patch\n+++ /dev/null\n@@ -1,32 +0,0 @@\n-From 5ce33b603063f36272fcfb1b4a5fde69f46eca88 Mon Sep 17 00:00:00 2001\n-From: Daniel Golle \n-Date: Thu, 9 Mar 2017 00:54:22 +0100\n-Subject: [PATCH 18/19] rt2x00: fix TX_PWR_CFG_4 register definition\n-\n-Some of the macros used to describe the TX_PWR_CFG_4 register accidentally\n-refer to TX_PWR_CFG_3, probably a copy&paste error. Fix that.\n-\n-Signed-off-by: Daniel Golle \n-Acked-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800.h | 8 ++++----\n- 1 file changed, 4 insertions(+), 4 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-@@ -1171,10 +1171,10 @@\n- #define TX_PWR_CFG_4_UKNOWN7\t\tFIELD32(0x00000f00)\n- #define TX_PWR_CFG_4_UKNOWN8\t\tFIELD32(0x0000f000)\n- /* bits for 3T devices */\n--#define TX_PWR_CFG_3_STBC4_CH0\t\tFIELD32(0x0000000f)\n--#define TX_PWR_CFG_3_STBC4_CH1\t\tFIELD32(0x000000f0)\n--#define TX_PWR_CFG_3_STBC6_CH0\t\tFIELD32(0x00000f00)\n--#define TX_PWR_CFG_3_STBC6_CH1\t\tFIELD32(0x0000f000)\n-+#define TX_PWR_CFG_4_STBC4_CH0\t\tFIELD32(0x0000000f)\n-+#define TX_PWR_CFG_4_STBC4_CH1\t\tFIELD32(0x000000f0)\n-+#define TX_PWR_CFG_4_STBC6_CH0\t\tFIELD32(0x00000f00)\n-+#define TX_PWR_CFG_4_STBC6_CH1\t\tFIELD32(0x0000f000)\n- \n- /*\n- * TX_PIN_CFG:\ndiff --git a/package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch b/package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch\ndeleted file mode 100644\nindex b91e5821cd..0000000000\n--- a/package/kernel/mac80211/patches/020-19-rt2x00-add-support-for-MT7620.patch\n+++ /dev/null\n@@ -1,2064 +0,0 @@\n-From 41977e86c984fcdddb454a3d7887de5d47b5f530 Mon Sep 17 00:00:00 2001\n-From: Roman Yeryomin \n-Date: Tue, 21 Mar 2017 00:43:00 +0100\n-Subject: [PATCH 19/19] rt2x00: add support for MT7620\n-\n-Basic support for MT7620 built-in wireless radio was added to\n-OpenWrt in r41441. It has seen some heavy cleaning and refactoring\n-since in order to match the Kernel's code quality standards.\n-\n-Signed-off-by: Roman Yeryomin \n-Signed-off-by: Daniel Golle \n-Acked-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/Kconfig | 2 +-\n- drivers/net/wireless/ralink/rt2x00/rt2800.h | 177 +++\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 1421 +++++++++++++++++++++++-\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 4 +\n- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 1 +\n- 5 files changed, 1578 insertions(+), 27 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/Kconfig\n-+++ b/drivers/net/wireless/ralink/rt2x00/Kconfig\n-@@ -210,7 +210,7 @@ endif\n- config RT2800SOC\n- \ttristate \"Ralink WiSoC support\"\n- \tdepends on m\n--\tdepends on SOC_RT288X || SOC_RT305X\n-+\tdepends on SOC_RT288X || SOC_RT305X || SOC_MT7620\n- \tselect RT2X00_LIB_SOC\n- \tselect RT2X00_LIB_MMIO\n- \tselect RT2X00_LIB_CRYPTO\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h\n-@@ -79,6 +79,7 @@\n- #define RF5372\t\t\t\t0x5372\n- #define RF5390\t\t\t\t0x5390\n- #define RF5392\t\t\t\t0x5392\n-+#define RF7620\t\t\t\t0x7620\n- \n- /*\n- * Chipset revisions.\n-@@ -639,6 +640,24 @@\n- #define RF_CSR_CFG_BUSY\t\t\tFIELD32(0x00020000)\n- \n- /*\n-+ * MT7620 RF registers (reversed order)\n-+ */\n-+#define RF_CSR_CFG_DATA_MT7620\t\tFIELD32(0x0000ff00)\n-+#define RF_CSR_CFG_REGNUM_MT7620\tFIELD32(0x03ff0000)\n-+#define RF_CSR_CFG_WRITE_MT7620\t\tFIELD32(0x00000010)\n-+#define RF_CSR_CFG_BUSY_MT7620\t\tFIELD32(0x00000001)\n-+\n-+/* undocumented registers for calibration of new MAC */\n-+#define RF_CONTROL0\t\t\t0x0518\n-+#define RF_BYPASS0\t\t\t0x051c\n-+#define RF_CONTROL1\t\t\t0x0520\n-+#define RF_BYPASS1\t\t\t0x0524\n-+#define RF_CONTROL2\t\t\t0x0528\n-+#define RF_BYPASS2\t\t\t0x052c\n-+#define RF_CONTROL3\t\t\t0x0530\n-+#define RF_BYPASS3\t\t\t0x0534\n-+\n-+/*\n- * EFUSE_CSR: RT30x0 EEPROM\n- */\n- #define EFUSE_CTRL\t\t\t0x0580\n-@@ -1022,6 +1041,16 @@\n- #define AUTOWAKEUP_CFG_AUTOWAKE\t\tFIELD32(0x00008000)\n- \n- /*\n-+ * MIMO_PS_CFG: MIMO Power-save Configuration\n-+ */\n-+#define MIMO_PS_CFG\t\t\t0x1210\n-+#define MIMO_PS_CFG_MMPS_BB_EN\t\tFIELD32(0x00000001)\n-+#define MIMO_PS_CFG_MMPS_RX_ANT_NUM\tFIELD32(0x00000006)\n-+#define MIMO_PS_CFG_MMPS_RF_EN\t\tFIELD32(0x00000008)\n-+#define MIMO_PS_CFG_RX_STBY_POL\t\tFIELD32(0x00000010)\n-+#define MIMO_PS_CFG_RX_RX_STBY0\t\tFIELD32(0x00000020)\n-+\n-+/*\n- * EDCA_AC0_CFG:\n- */\n- #define EDCA_AC0_CFG\t\t\t0x1300\n-@@ -1095,6 +1124,12 @@\n- #define TX_PWR_CFG_0_OFDM6_CH1\t\tFIELD32(0x00f00000)\n- #define TX_PWR_CFG_0_OFDM12_CH0\t\tFIELD32(0x0f000000)\n- #define TX_PWR_CFG_0_OFDM12_CH1\t\tFIELD32(0xf0000000)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_0B_1MBS_2MBS\t\tFIELD32(0x000000ff)\n-+#define TX_PWR_CFG_0B_5MBS_11MBS\t\tFIELD32(0x0000ff00)\n-+#define TX_PWR_CFG_0B_6MBS_9MBS\t\tFIELD32(0x00ff0000)\n-+#define TX_PWR_CFG_0B_12MBS_18MBS\tFIELD32(0xff000000)\n-+\n- \n- /*\n- * TX_PWR_CFG_1:\n-@@ -1117,6 +1152,11 @@\n- #define TX_PWR_CFG_1_MCS0_CH1\t\tFIELD32(0x00f00000)\n- #define TX_PWR_CFG_1_MCS2_CH0\t\tFIELD32(0x0f000000)\n- #define TX_PWR_CFG_1_MCS2_CH1\t\tFIELD32(0xf0000000)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_1B_24MBS_36MBS\tFIELD32(0x000000ff)\n-+#define TX_PWR_CFG_1B_48MBS\t\tFIELD32(0x0000ff00)\n-+#define TX_PWR_CFG_1B_MCS0_MCS1\t\tFIELD32(0x00ff0000)\n-+#define TX_PWR_CFG_1B_MCS2_MCS3\t\tFIELD32(0xff000000)\n- \n- /*\n- * TX_PWR_CFG_2:\n-@@ -1139,6 +1179,11 @@\n- #define TX_PWR_CFG_2_MCS8_CH1\t\tFIELD32(0x00f00000)\n- #define TX_PWR_CFG_2_MCS10_CH0\t\tFIELD32(0x0f000000)\n- #define TX_PWR_CFG_2_MCS10_CH1\t\tFIELD32(0xf0000000)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_2B_MCS4_MCS5\t\tFIELD32(0x000000ff)\n-+#define TX_PWR_CFG_2B_MCS6_MCS7\t\tFIELD32(0x0000ff00)\n-+#define TX_PWR_CFG_2B_MCS8_MCS9\t\tFIELD32(0x00ff0000)\n-+#define TX_PWR_CFG_2B_MCS10_MCS11\tFIELD32(0xff000000)\n- \n- /*\n- * TX_PWR_CFG_3:\n-@@ -1161,6 +1206,11 @@\n- #define TX_PWR_CFG_3_STBC0_CH1\t\tFIELD32(0x00f00000)\n- #define TX_PWR_CFG_3_STBC2_CH0\t\tFIELD32(0x0f000000)\n- #define TX_PWR_CFG_3_STBC2_CH1\t\tFIELD32(0xf0000000)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_3B_MCS12_MCS13\tFIELD32(0x000000ff)\n-+#define TX_PWR_CFG_3B_MCS14\t\tFIELD32(0x0000ff00)\n-+#define TX_PWR_CFG_3B_STBC_MCS0_MCS1\tFIELD32(0x00ff0000)\n-+#define TX_PWR_CFG_3B_STBC_MCS2_MSC3\tFIELD32(0xff000000)\n- \n- /*\n- * TX_PWR_CFG_4:\n-@@ -1175,6 +1225,9 @@\n- #define TX_PWR_CFG_4_STBC4_CH1\t\tFIELD32(0x000000f0)\n- #define TX_PWR_CFG_4_STBC6_CH0\t\tFIELD32(0x00000f00)\n- #define TX_PWR_CFG_4_STBC6_CH1\t\tFIELD32(0x0000f000)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_4B_STBC_MCS4_MCS5\tFIELD32(0x000000ff)\n-+#define TX_PWR_CFG_4B_STBC_MCS6\t\tFIELD32(0x0000ff00)\n- \n- /*\n- * TX_PIN_CFG:\n-@@ -1201,6 +1254,8 @@\n- #define TX_PIN_CFG_RFTR_POL\t\tFIELD32(0x00020000)\n- #define TX_PIN_CFG_TRSW_EN\t\tFIELD32(0x00040000)\n- #define TX_PIN_CFG_TRSW_POL\t\tFIELD32(0x00080000)\n-+#define TX_PIN_CFG_RFRX_EN\t\tFIELD32(0x00100000)\n-+#define TX_PIN_CFG_RFRX_POL\t\tFIELD32(0x00200000)\n- #define TX_PIN_CFG_PA_PE_A2_EN\t\tFIELD32(0x01000000)\n- #define TX_PIN_CFG_PA_PE_G2_EN\t\tFIELD32(0x02000000)\n- #define TX_PIN_CFG_PA_PE_A2_POL\t\tFIELD32(0x04000000)\n-@@ -1547,6 +1602,95 @@\n- #define TX_PWR_CFG_4_EXT_STBC4_CH2\tFIELD32(0x0000000f)\n- #define TX_PWR_CFG_4_EXT_STBC6_CH2\tFIELD32(0x00000f00)\n- \n-+/* TXn_RF_GAIN_CORRECT: RF Gain Correction for each RF_ALC[3:2]\n-+ * Unit: 0.1 dB, Range: -3.2 dB to 3.1 dB\n-+ */\n-+#define TX0_RF_GAIN_CORRECT\t\t0x13a0\n-+#define TX0_RF_GAIN_CORRECT_GAIN_CORR_0\tFIELD32(0x0000003f)\n-+#define TX0_RF_GAIN_CORRECT_GAIN_CORR_1\tFIELD32(0x00003f00)\n-+#define TX0_RF_GAIN_CORRECT_GAIN_CORR_2\tFIELD32(0x003f0000)\n-+#define TX0_RF_GAIN_CORRECT_GAIN_CORR_3\tFIELD32(0x3f000000)\n-+\n-+#define TX1_RF_GAIN_CORRECT\t\t0x13a4\n-+#define TX1_RF_GAIN_CORRECT_GAIN_CORR_0\tFIELD32(0x0000003f)\n-+#define TX1_RF_GAIN_CORRECT_GAIN_CORR_1\tFIELD32(0x00003f00)\n-+#define TX1_RF_GAIN_CORRECT_GAIN_CORR_2\tFIELD32(0x003f0000)\n-+#define TX1_RF_GAIN_CORRECT_GAIN_CORR_3\tFIELD32(0x3f000000)\n-+\n-+/* TXn_RF_GAIN_ATTEN: TXn RF Gain Attenuation Level\n-+ * Format: 7-bit, signed value\n-+ * Unit: 0.5 dB, Range: -20 dB to -5 dB\n-+ */\n-+#define TX0_RF_GAIN_ATTEN\t\t0x13a8\n-+#define TX0_RF_GAIN_ATTEN_LEVEL_0\tFIELD32(0x0000007f)\n-+#define TX0_RF_GAIN_ATTEN_LEVEL_1\tFIELD32(0x00007f00)\n-+#define TX0_RF_GAIN_ATTEN_LEVEL_2\tFIELD32(0x007f0000)\n-+#define TX0_RF_GAIN_ATTEN_LEVEL_3\tFIELD32(0x7f000000)\n-+#define TX1_RF_GAIN_ATTEN\t\t0x13ac\n-+#define TX1_RF_GAIN_ATTEN_LEVEL_0\tFIELD32(0x0000007f)\n-+#define TX1_RF_GAIN_ATTEN_LEVEL_1\tFIELD32(0x00007f00)\n-+#define TX1_RF_GAIN_ATTEN_LEVEL_2\tFIELD32(0x007f0000)\n-+#define TX1_RF_GAIN_ATTEN_LEVEL_3\tFIELD32(0x7f000000)\n-+\n-+/* TX_ALC_CFG_0: TX Automatic Level Control Configuration 0\n-+ * TX_ALC_LIMIT_n: TXn upper limit\n-+ * TX_ALC_CH_INIT_n: TXn channel initial transmission gain\n-+ * Unit: 0.5 dB, Range: 0 to 23.5 dB\n-+ */\n-+#define TX_ALC_CFG_0\t\t\t0x13b0\n-+#define TX_ALC_CFG_0_CH_INIT_0\t\tFIELD32(0x0000003f)\n-+#define TX_ALC_CFG_0_CH_INIT_1\t\tFIELD32(0x00003f00)\n-+#define TX_ALC_CFG_0_LIMIT_0\t\tFIELD32(0x003f0000)\n-+#define TX_ALC_CFG_0_LIMIT_1\t\tFIELD32(0x3f000000)\n-+\n-+/* TX_ALC_CFG_1: TX Automatic Level Control Configuration 1\n-+ * TX_TEMP_COMP: TX Power Temperature Compensation\n-+ * Unit: 0.5 dB, Range: -10 dB to 10 dB\n-+ * TXn_GAIN_FINE: TXn Gain Fine Adjustment\n-+ * Unit: 0.1 dB, Range: -0.8 dB to 0.7 dB\n-+ * RF_TOS_DLY: Sets the RF_TOS_EN assertion delay after\n-+ * deassertion of PA_PE.\n-+ * Unit: 0.25 usec\n-+ * TXn_RF_GAIN_ATTEN: TXn RF gain attentuation selector\n-+ * RF_TOS_TIMEOUT: time-out value for RF_TOS_ENABLE\n-+ * deassertion if RF_TOS_DONE is missing.\n-+ * Unit: 0.25 usec\n-+ * RF_TOS_ENABLE: TX offset calibration enable\n-+ * ROS_BUSY_EN: RX offset calibration busy enable\n-+ */\n-+#define TX_ALC_CFG_1\t\t\t0x13b4\n-+#define TX_ALC_CFG_1_TX_TEMP_COMP\tFIELD32(0x0000003f)\n-+#define TX_ALC_CFG_1_TX0_GAIN_FINE\tFIELD32(0x00000f00)\n-+#define TX_ALC_CFG_1_TX1_GAIN_FINE\tFIELD32(0x0000f000)\n-+#define TX_ALC_CFG_1_RF_TOS_DLY\t\tFIELD32(0x00070000)\n-+#define TX_ALC_CFG_1_TX0_RF_GAIN_ATTEN\tFIELD32(0x00300000)\n-+#define TX_ALC_CFG_1_TX1_RF_GAIN_ATTEN\tFIELD32(0x00c00000)\n-+#define TX_ALC_CFG_1_RF_TOS_TIMEOUT\tFIELD32(0x3f000000)\n-+#define TX_ALC_CFG_1_RF_TOS_ENABLE\tFIELD32(0x40000000)\n-+#define TX_ALC_CFG_1_ROS_BUSY_EN\tFIELD32(0x80000000)\n-+\n-+/* TXn_BB_GAIN_ATTEN: TXn RF Gain Attenuation Level\n-+ * Format: 5-bit signed values\n-+ * Unit: 0.5 dB, Range: -8 dB to 7 dB\n-+ */\n-+#define TX0_BB_GAIN_ATTEN\t\t0x13c0\n-+#define TX0_BB_GAIN_ATTEN_LEVEL_0\tFIELD32(0x0000001f)\n-+#define TX0_BB_GAIN_ATTEN_LEVEL_1\tFIELD32(0x00001f00)\n-+#define TX0_BB_GAIN_ATTEN_LEVEL_2\tFIELD32(0x001f0000)\n-+#define TX0_BB_GAIN_ATTEN_LEVEL_3\tFIELD32(0x1f000000)\n-+#define TX1_BB_GAIN_ATTEN\t\t0x13c4\n-+#define TX1_BB_GAIN_ATTEN_LEVEL_0\tFIELD32(0x0000001f)\n-+#define TX1_BB_GAIN_ATTEN_LEVEL_1\tFIELD32(0x00001f00)\n-+#define TX1_BB_GAIN_ATTEN_LEVEL_2\tFIELD32(0x001f0000)\n-+#define TX1_BB_GAIN_ATTEN_LEVEL_3\tFIELD32(0x1f000000)\n-+\n-+/* TX_ALC_VGA3: TX Automatic Level Correction Variable Gain Amplifier 3 */\n-+#define TX_ALC_VGA3\t\t\t0x13c8\n-+#define TX_ALC_VGA3_TX0_ALC_VGA3\tFIELD32(0x0000001f)\n-+#define TX_ALC_VGA3_TX1_ALC_VGA3\tFIELD32(0x00001f00)\n-+#define TX_ALC_VGA3_TX0_ALC_VGA2\tFIELD32(0x001f0000)\n-+#define TX_ALC_VGA3_TX1_ALC_VGA2\tFIELD32(0x1f000000)\n-+\n- /* TX_PWR_CFG_7 */\n- #define TX_PWR_CFG_7\t\t\t0x13d4\n- #define TX_PWR_CFG_7_OFDM54_CH0\t\tFIELD32(0x0000000f)\n-@@ -1555,6 +1699,10 @@\n- #define TX_PWR_CFG_7_MCS7_CH0\t\tFIELD32(0x000f0000)\n- #define TX_PWR_CFG_7_MCS7_CH1\t\tFIELD32(0x00f00000)\n- #define TX_PWR_CFG_7_MCS7_CH2\t\tFIELD32(0x0f000000)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_7B_54MBS\t\tFIELD32(0x000000ff)\n-+#define TX_PWR_CFG_7B_MCS7\t\tFIELD32(0x00ff0000)\n-+\n- \n- /* TX_PWR_CFG_8 */\n- #define TX_PWR_CFG_8\t\t\t0x13d8\n-@@ -1564,12 +1712,17 @@\n- #define TX_PWR_CFG_8_MCS23_CH0\t\tFIELD32(0x000f0000)\n- #define TX_PWR_CFG_8_MCS23_CH1\t\tFIELD32(0x00f00000)\n- #define TX_PWR_CFG_8_MCS23_CH2\t\tFIELD32(0x0f000000)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_8B_MCS15\t\tFIELD32(0x000000ff)\n-+\n- \n- /* TX_PWR_CFG_9 */\n- #define TX_PWR_CFG_9\t\t\t0x13dc\n- #define TX_PWR_CFG_9_STBC7_CH0\t\tFIELD32(0x0000000f)\n- #define TX_PWR_CFG_9_STBC7_CH1\t\tFIELD32(0x000000f0)\n- #define TX_PWR_CFG_9_STBC7_CH2\t\tFIELD32(0x00000f00)\n-+/* bits for new 2T devices */\n-+#define TX_PWR_CFG_9B_STBC_MCS7\t\tFIELD32(0x000000ff)\n- \n- /*\n- * RX_FILTER_CFG: RX configuration register.\n-@@ -2137,11 +2290,14 @@ struct mac_iveiv_entry {\n- #define RFCSR1_TX1_PD\t\t\tFIELD8(0x20)\n- #define RFCSR1_RX2_PD\t\t\tFIELD8(0x40)\n- #define RFCSR1_TX2_PD\t\t\tFIELD8(0x80)\n-+#define RFCSR1_TX2_EN_MT7620\t\tFIELD8(0x02)\n- \n- /*\n- * RFCSR 2:\n- */\n- #define RFCSR2_RESCAL_EN\t\tFIELD8(0x80)\n-+#define RFCSR2_RX2_EN_MT7620\t\tFIELD8(0x02)\n-+#define RFCSR2_TX2_EN_MT7620\t\tFIELD8(0x20)\n- \n- /*\n- * RFCSR 3:\n-@@ -2160,6 +2316,12 @@ struct mac_iveiv_entry {\n- #define RFCSR3_BIT5\t\t\tFIELD8(0x20)\n- \n- /*\n-+ * RFCSR 4:\n-+ * VCOCAL_EN used by MT7620\n-+ */\n-+#define RFCSR4_VCOCAL_EN\t\tFIELD8(0x80)\n-+\n-+/*\n- * FRCSR 5:\n- */\n- #define RFCSR5_R1\t\t\tFIELD8(0x0c)\n-@@ -2214,6 +2376,7 @@ struct mac_iveiv_entry {\n- */\n- #define RFCSR13_TX_POWER\t\tFIELD8(0x1f)\n- #define RFCSR13_DR0\t\t\tFIELD8(0xe0)\n-+#define RFCSR13_RDIV_MT7620\t\tFIELD8(0x03)\n- \n- /*\n- * RFCSR 15:\n-@@ -2224,6 +2387,8 @@ struct mac_iveiv_entry {\n- * RFCSR 16:\n- */\n- #define RFCSR16_TXMIXER_GAIN\t\tFIELD8(0x07)\n-+#define RFCSR16_RF_PLL_FREQ_SEL_MT7620\tFIELD8(0x0F)\n-+#define RFCSR16_SDM_MODE_MT7620\t\tFIELD8(0xE0)\n- \n- /*\n- * RFCSR 17:\n-@@ -2236,6 +2401,8 @@ struct mac_iveiv_entry {\n- /* RFCSR 18 */\n- #define RFCSR18_XO_TUNE_BYPASS\t\tFIELD8(0x40)\n- \n-+/* RFCSR 19 */\n-+#define RFCSR19_K\t\t\tFIELD8(0x03)\n- \n- /*\n- * RFCSR 20:\n-@@ -2246,11 +2413,14 @@ struct mac_iveiv_entry {\n- * RFCSR 21:\n- */\n- #define RFCSR21_RX_LO2_EN\t\tFIELD8(0x08)\n-+#define RFCSR21_BIT1\t\t\tFIELD8(0x01)\n-+#define RFCSR21_BIT8\t\t\tFIELD8(0x80)\n- \n- /*\n- * RFCSR 22:\n- */\n- #define RFCSR22_BASEBAND_LOOPBACK\tFIELD8(0x01)\n-+#define RFCSR22_FREQPLAN_D_MT7620\tFIELD8(0x07)\n- \n- /*\n- * RFCSR 23:\n-@@ -2273,6 +2443,11 @@ struct mac_iveiv_entry {\n- #define RFCSR27_R4\t\t\tFIELD8(0x40)\n- \n- /*\n-+ * RFCSR 28:\n-+ */\n-+#define RFCSR28_CH11_HT40\t\tFIELD8(0x04)\n-+\n-+/*\n- * RFCSR 29:\n- */\n- #define RFCSR29_ADC6_TEST\t\tFIELD8(0x01)\n-@@ -2333,6 +2508,7 @@ struct mac_iveiv_entry {\n- */\n- #define RFCSR42_BIT1\t\t\tFIELD8(0x01)\n- #define RFCSR42_BIT4\t\t\tFIELD8(0x08)\n-+#define RFCSR42_TX2_EN_MT7620\t\tFIELD8(0x40)\n- \n- /*\n- * RFCSR 49:\n-@@ -2435,6 +2611,7 @@ enum rt2800_eeprom_word {\n- \tEEPROM_TSSI_BOUND_BG5,\n- \tEEPROM_TXPOWER_A1,\n- \tEEPROM_TXPOWER_A2,\n-+\tEEPROM_TXPOWER_INIT,\n- \tEEPROM_TSSI_BOUND_A1,\n- \tEEPROM_TSSI_BOUND_A2,\n- \tEEPROM_TSSI_BOUND_A3,\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -59,6 +59,9 @@\n- \trt2800_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg))\n- #define WAIT_FOR_RFCSR(__dev, __reg) \\\n- \trt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg))\n-+#define WAIT_FOR_RFCSR_MT7620(__dev, __reg) \\\n-+\trt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY_MT7620, \\\n-+\t\t\t (__reg))\n- #define WAIT_FOR_RF(__dev, __reg) \\\n- \trt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg))\n- #define WAIT_FOR_MCU(__dev, __reg) \\\n-@@ -150,19 +153,56 @@ static void rt2800_rfcsr_write(struct rt\n- \t * Wait until the RFCSR becomes available, afterwards we\n- \t * can safely write the new data into the register.\n- \t */\n--\tif (WAIT_FOR_RFCSR(rt2x00dev, ®)) {\n--\t\treg = 0;\n--\t\trt2x00_set_field32(®, RF_CSR_CFG_DATA, value);\n--\t\trt2x00_set_field32(®, RF_CSR_CFG_REGNUM, word);\n--\t\trt2x00_set_field32(®, RF_CSR_CFG_WRITE, 1);\n--\t\trt2x00_set_field32(®, RF_CSR_CFG_BUSY, 1);\n-+\tswitch (rt2x00dev->chip.rt) {\n-+\tcase RT6352:\n-+\t\tif (WAIT_FOR_RFCSR_MT7620(rt2x00dev, ®)) {\n-+\t\t\treg = 0;\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_DATA_MT7620, value);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_REGNUM_MT7620,\n-+\t\t\t\t\t word);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_WRITE_MT7620, 1);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_BUSY_MT7620, 1);\n-+\n-+\t\t\trt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);\n-+\t\t}\n-+\t\tbreak;\n-+\n-+\tdefault:\n-+\t\tif (WAIT_FOR_RFCSR(rt2x00dev, ®)) {\n-+\t\t\treg = 0;\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_DATA, value);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_REGNUM, word);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_WRITE, 1);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_BUSY, 1);\n- \n--\t\trt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);\n-+\t\t\trt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);\n-+\t\t}\n-+\t\tbreak;\n- \t}\n- \n- \tmutex_unlock(&rt2x00dev->csr_mutex);\n- }\n- \n-+static void rt2800_rfcsr_write_bank(struct rt2x00_dev *rt2x00dev, const u8 bank,\n-+\t\t\t\t const unsigned int reg, const u8 value)\n-+{\n-+\trt2800_rfcsr_write(rt2x00dev, (reg | (bank << 6)), value);\n-+}\n-+\n-+static void rt2800_rfcsr_write_chanreg(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t const unsigned int reg, const u8 value)\n-+{\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 4, reg, value);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 6, reg, value);\n-+}\n-+\n-+static void rt2800_rfcsr_write_dccal(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t const unsigned int reg, const u8 value)\n-+{\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, reg, value);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 7, reg, value);\n-+}\n-+\n- static void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev,\n- \t\t\t const unsigned int word, u8 *value)\n- {\n-@@ -178,22 +218,48 @@ static void rt2800_rfcsr_read(struct rt2\n- \t * doesn't become available in time, reg will be 0xffffffff\n- \t * which means we return 0xff to the caller.\n- \t */\n--\tif (WAIT_FOR_RFCSR(rt2x00dev, ®)) {\n--\t\treg = 0;\n--\t\trt2x00_set_field32(®, RF_CSR_CFG_REGNUM, word);\n--\t\trt2x00_set_field32(®, RF_CSR_CFG_WRITE, 0);\n--\t\trt2x00_set_field32(®, RF_CSR_CFG_BUSY, 1);\n-+\tswitch (rt2x00dev->chip.rt) {\n-+\tcase RT6352:\n-+\t\tif (WAIT_FOR_RFCSR_MT7620(rt2x00dev, ®)) {\n-+\t\t\treg = 0;\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_REGNUM_MT7620,\n-+\t\t\t\t\t word);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_WRITE_MT7620, 0);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_BUSY_MT7620, 1);\n- \n--\t\trt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);\n-+\t\t\trt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);\n- \n--\t\tWAIT_FOR_RFCSR(rt2x00dev, ®);\n--\t}\n-+\t\t\tWAIT_FOR_RFCSR_MT7620(rt2x00dev, ®);\n-+\t\t}\n-+\n-+\t\t*value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA_MT7620);\n-+\t\tbreak;\n- \n--\t*value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA);\n-+\tdefault:\n-+\t\tif (WAIT_FOR_RFCSR(rt2x00dev, ®)) {\n-+\t\t\treg = 0;\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_REGNUM, word);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_WRITE, 0);\n-+\t\t\trt2x00_set_field32(®, RF_CSR_CFG_BUSY, 1);\n-+\n-+\t\t\trt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);\n-+\n-+\t\t\tWAIT_FOR_RFCSR(rt2x00dev, ®);\n-+\t\t}\n-+\n-+\t\t*value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA);\n-+\t\tbreak;\n-+\t}\n- \n- \tmutex_unlock(&rt2x00dev->csr_mutex);\n- }\n- \n-+static void rt2800_rfcsr_read_bank(struct rt2x00_dev *rt2x00dev, const u8 bank,\n-+\t\t\t\t const unsigned int reg, u8 *value)\n-+{\n-+\trt2800_rfcsr_read(rt2x00dev, (reg | (bank << 6)), value);\n-+}\n-+\n- static void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,\n- \t\t\t const unsigned int word, const u32 value)\n- {\n-@@ -250,6 +316,7 @@ static const unsigned int rt2800_eeprom_\n- \t[EEPROM_TSSI_BOUND_BG5]\t\t= 0x003b,\n- \t[EEPROM_TXPOWER_A1]\t\t= 0x003c,\n- \t[EEPROM_TXPOWER_A2]\t\t= 0x0053,\n-+\t[EEPROM_TXPOWER_INIT]\t\t= 0x0068,\n- \t[EEPROM_TSSI_BOUND_A1]\t\t= 0x006a,\n- \t[EEPROM_TSSI_BOUND_A2]\t\t= 0x006b,\n- \t[EEPROM_TSSI_BOUND_A3]\t\t= 0x006c,\n-@@ -524,6 +591,7 @@ void rt2800_get_txwi_rxwi_size(struct rt\n- \t\tbreak;\n- \n- \tcase RT5592:\n-+\tcase RT6352:\n- \t\t*txwi_size = TXWI_DESC_SIZE_5WORDS;\n- \t\t*rxwi_size = RXWI_DESC_SIZE_6WORDS;\n- \t\tbreak;\n-@@ -2810,7 +2878,8 @@ static void rt2800_config_channel_rf53xx\n- \t\t\t\trt2800_rfcsr_write(rt2x00dev, 59,\n- \t\t\t\t\t\t r59_nonbt_rev[idx]);\n- \t\t\t} else if (rt2x00_rt(rt2x00dev, RT5390) ||\n--\t\t\t\t rt2x00_rt(rt2x00dev, RT5392)) {\n-+\t\t\t\t rt2x00_rt(rt2x00dev, RT5392) ||\n-+\t\t\t\t rt2x00_rt(rt2x00dev, RT6352)) {\n- \t\t\t\tstatic const char r59_non_bt[] = {0x8f, 0x8f,\n- \t\t\t\t\t0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,\n- \t\t\t\t\t0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};\n-@@ -3104,6 +3173,242 @@ static void rt2800_config_channel_rf55xx\n- \trt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x19 : 0x7F);\n- }\n- \n-+static void rt2800_config_channel_rf7620(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t\t struct ieee80211_conf *conf,\n-+\t\t\t\t\t struct rf_channel *rf,\n-+\t\t\t\t\t struct channel_info *info)\n-+{\n-+\tstruct rt2800_drv_data *drv_data = rt2x00dev->drv_data;\n-+\tu8 rx_agc_fc, tx_agc_fc;\n-+\tu8 rfcsr;\n-+\n-+\t/* Frequeny plan setting */\n-+\t/* Rdiv setting (set 0x03 if Xtal==20)\n-+\t * R13[1:0]\n-+\t */\n-+\trt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR13_RDIV_MT7620,\n-+\t\t\t rt2800_clk_is_20mhz(rt2x00dev) ? 3 : 0);\n-+\trt2800_rfcsr_write(rt2x00dev, 13, rfcsr);\n-+\n-+\t/* N setting\n-+\t * R20[7:0] in rf->rf1\n-+\t * R21[0] always 0\n-+\t */\n-+\trt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);\n-+\trfcsr = (rf->rf1 & 0x00ff);\n-+\trt2800_rfcsr_write(rt2x00dev, 20, rfcsr);\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR21_BIT1, 0);\n-+\trt2800_rfcsr_write(rt2x00dev, 21, rfcsr);\n-+\n-+\t/* K setting (always 0)\n-+\t * R16[3:0] (RF PLL freq selection)\n-+\t */\n-+\trt2800_rfcsr_read(rt2x00dev, 16, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR16_RF_PLL_FREQ_SEL_MT7620, 0);\n-+\trt2800_rfcsr_write(rt2x00dev, 16, rfcsr);\n-+\n-+\t/* D setting (always 0)\n-+\t * R22[2:0] (D=15, R22[2:0]=<111>)\n-+\t */\n-+\trt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR22_FREQPLAN_D_MT7620, 0);\n-+\trt2800_rfcsr_write(rt2x00dev, 22, rfcsr);\n-+\n-+\t/* Ksd setting\n-+\t * Ksd: R17<7:0> in rf->rf2\n-+\t * R18<7:0> in rf->rf3\n-+\t * R19<1:0> in rf->rf4\n-+\t */\n-+\trt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);\n-+\trfcsr = rf->rf2;\n-+\trt2800_rfcsr_write(rt2x00dev, 17, rfcsr);\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 18, &rfcsr);\n-+\trfcsr = rf->rf3;\n-+\trt2800_rfcsr_write(rt2x00dev, 18, rfcsr);\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 19, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR19_K, rf->rf4);\n-+\trt2800_rfcsr_write(rt2x00dev, 19, rfcsr);\n-+\n-+\t/* Default: XO=20MHz , SDM mode */\n-+\trt2800_rfcsr_read(rt2x00dev, 16, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR16_SDM_MODE_MT7620, 0x80);\n-+\trt2800_rfcsr_write(rt2x00dev, 16, rfcsr);\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR21_BIT8, 1);\n-+\trt2800_rfcsr_write(rt2x00dev, 21, rfcsr);\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR1_TX2_EN_MT7620,\n-+\t\t\t rt2x00dev->default_ant.tx_chain_num != 1);\n-+\trt2800_rfcsr_write(rt2x00dev, 1, rfcsr);\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR2_TX2_EN_MT7620,\n-+\t\t\t rt2x00dev->default_ant.tx_chain_num != 1);\n-+\trt2x00_set_field8(&rfcsr, RFCSR2_RX2_EN_MT7620,\n-+\t\t\t rt2x00dev->default_ant.rx_chain_num != 1);\n-+\trt2800_rfcsr_write(rt2x00dev, 2, rfcsr);\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 42, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR42_TX2_EN_MT7620,\n-+\t\t\t rt2x00dev->default_ant.tx_chain_num != 1);\n-+\trt2800_rfcsr_write(rt2x00dev, 42, rfcsr);\n-+\n-+\t/* RF for DC Cal BW */\n-+\tif (conf_is_ht40(conf)) {\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x10);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x10);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x04);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x10);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x10);\n-+\t} else {\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x20);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x20);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x00);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x20);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x20);\n-+\t}\n-+\n-+\tif (conf_is_ht40(conf)) {\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x08);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x08);\n-+\t} else {\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x28);\n-+\t\trt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x28);\n-+\t}\n-+\n-+\trt2800_rfcsr_read(rt2x00dev, 28, &rfcsr);\n-+\trt2x00_set_field8(&rfcsr, RFCSR28_CH11_HT40,\n-+\t\t\t conf_is_ht40(conf) && (rf->channel == 11));\n-+\trt2800_rfcsr_write(rt2x00dev, 28, rfcsr);\n-+\n-+\tif (!test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags)) {\n-+\t\tif (conf_is_ht40(conf)) {\n-+\t\t\trx_agc_fc = drv_data->rx_calibration_bw40;\n-+\t\t\ttx_agc_fc = drv_data->tx_calibration_bw40;\n-+\t\t} else {\n-+\t\t\trx_agc_fc = drv_data->rx_calibration_bw20;\n-+\t\t\ttx_agc_fc = drv_data->tx_calibration_bw20;\n-+\t\t}\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 6, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= rx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 6, rfcsr);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 7, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= rx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 7, rfcsr);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 7, 6, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= rx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 7, 6, rfcsr);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 7, 7, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= rx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 7, 7, rfcsr);\n-+\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 58, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= tx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 58, rfcsr);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 59, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= tx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 59, rfcsr);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 7, 58, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= tx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 7, 58, rfcsr);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 7, 59, &rfcsr);\n-+\t\trfcsr &= (~0x3F);\n-+\t\trfcsr |= tx_agc_fc;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 7, 59, rfcsr);\n-+\t}\n-+}\n-+\n-+static void rt2800_config_alc(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t struct ieee80211_channel *chan,\n-+\t\t\t int power_level) {\n-+\tu16 eeprom, target_power, max_power;\n-+\tu32 mac_sys_ctrl, mac_status;\n-+\tu32 reg;\n-+\tu8 bbp;\n-+\tint i;\n-+\n-+\t/* hardware unit is 0.5dBm, limited to 23.5dBm */\n-+\tpower_level *= 2;\n-+\tif (power_level > 0x2f)\n-+\t\tpower_level = 0x2f;\n-+\n-+\tmax_power = chan->max_power * 2;\n-+\tif (max_power > 0x2f)\n-+\t\tmax_power = 0x2f;\n-+\n-+\trt2800_register_read(rt2x00dev, TX_ALC_CFG_0, ®);\n-+\trt2x00_set_field32(®, TX_ALC_CFG_0_CH_INIT_0, power_level);\n-+\trt2x00_set_field32(®, TX_ALC_CFG_0_CH_INIT_1, power_level);\n-+\trt2x00_set_field32(®, TX_ALC_CFG_0_LIMIT_0, max_power);\n-+\trt2x00_set_field32(®, TX_ALC_CFG_0_LIMIT_1, max_power);\n-+\n-+\trt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);\n-+\tif (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_INTERNAL_TX_ALC)) {\n-+\t\t/* init base power by eeprom target power */\n-+\t\trt2800_eeprom_read(rt2x00dev, EEPROM_TXPOWER_INIT,\n-+\t\t\t\t &target_power);\n-+\t\trt2x00_set_field32(®, TX_ALC_CFG_0_CH_INIT_0, target_power);\n-+\t\trt2x00_set_field32(®, TX_ALC_CFG_0_CH_INIT_1, target_power);\n-+\t}\n-+\trt2800_register_write(rt2x00dev, TX_ALC_CFG_0, reg);\n-+\n-+\trt2800_register_read(rt2x00dev, TX_ALC_CFG_1, ®);\n-+\trt2x00_set_field32(®, TX_ALC_CFG_1_TX_TEMP_COMP, 0);\n-+\trt2800_register_write(rt2x00dev, TX_ALC_CFG_1, reg);\n-+\n-+\t/* Save MAC SYS CTRL registers */\n-+\trt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &mac_sys_ctrl);\n-+\t/* Disable Tx/Rx */\n-+\trt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0);\n-+\t/* Check MAC Tx/Rx idle */\n-+\tfor (i = 0; i < 10000; i++) {\n-+\t\trt2800_register_read(rt2x00dev, MAC_STATUS_CFG,\n-+\t\t\t\t &mac_status);\n-+\t\tif (mac_status & 0x3)\n-+\t\t\tusleep_range(50, 200);\n-+\t\telse\n-+\t\t\tbreak;\n-+\t}\n-+\n-+\tif (i == 10000)\n-+\t\trt2x00_warn(rt2x00dev, \"Wait MAC Status to MAX !!!\\n\");\n-+\n-+\tif (chan->center_freq > 2457) {\n-+\t\trt2800_bbp_read(rt2x00dev, 30, &bbp);\n-+\t\tbbp = 0x40;\n-+\t\trt2800_bbp_write(rt2x00dev, 30, bbp);\n-+\t\trt2800_rfcsr_write(rt2x00dev, 39, 0);\n-+\t\tif (rt2x00_has_cap_external_lna_bg(rt2x00dev))\n-+\t\t\trt2800_rfcsr_write(rt2x00dev, 42, 0xfb);\n-+\t\telse\n-+\t\t\trt2800_rfcsr_write(rt2x00dev, 42, 0x7b);\n-+\t} else {\n-+\t\trt2800_bbp_read(rt2x00dev, 30, &bbp);\n-+\t\tbbp = 0x1f;\n-+\t\trt2800_bbp_write(rt2x00dev, 30, bbp);\n-+\t\trt2800_rfcsr_write(rt2x00dev, 39, 0x80);\n-+\t\tif (rt2x00_has_cap_external_lna_bg(rt2x00dev))\n-+\t\t\trt2800_rfcsr_write(rt2x00dev, 42, 0xdb);\n-+\t\telse\n-+\t\t\trt2800_rfcsr_write(rt2x00dev, 42, 0x5b);\n-+\t}\n-+\trt2800_register_write(rt2x00dev, MAC_SYS_CTRL, mac_sys_ctrl);\n-+}\n-+\n- static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev,\n- \t\t\t\t\t const unsigned int word,\n- \t\t\t\t\t const u8 value)\n-@@ -3228,7 +3533,7 @@ static void rt2800_config_channel(struct\n- \t\t\t\t struct channel_info *info)\n- {\n- \tu32 reg;\n--\tunsigned int tx_pin;\n-+\tu32 tx_pin;\n- \tu8 bbp, rfcsr;\n- \n- \tinfo->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,\n-@@ -3273,6 +3578,9 @@ static void rt2800_config_channel(struct\n- \tcase RF5592:\n- \t\trt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info);\n- \t\tbreak;\n-+\tcase RF7620:\n-+\t\trt2800_config_channel_rf7620(rt2x00dev, conf, rf, info);\n-+\t\tbreak;\n- \tdefault:\n- \t\trt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);\n- \t}\n-@@ -3347,7 +3655,8 @@ static void rt2800_config_channel(struct\n- \n- \tif (rf->channel <= 14) {\n- \t\tif (!rt2x00_rt(rt2x00dev, RT5390) &&\n--\t\t !rt2x00_rt(rt2x00dev, RT5392)) {\n-+\t\t !rt2x00_rt(rt2x00dev, RT5392) &&\n-+\t\t !rt2x00_rt(rt2x00dev, RT6352)) {\n- \t\t\tif (rt2x00_has_cap_external_lna_bg(rt2x00dev)) {\n- \t\t\t\trt2800_bbp_write(rt2x00dev, 82, 0x62);\n- \t\t\t\trt2800_bbp_write(rt2x00dev, 75, 0x46);\n-@@ -3367,7 +3676,7 @@ static void rt2800_config_channel(struct\n- \t\t\trt2800_bbp_write(rt2x00dev, 82, 0x94);\n- \t\telse if (rt2x00_rt(rt2x00dev, RT3593))\n- \t\t\trt2800_bbp_write(rt2x00dev, 82, 0x82);\n--\t\telse\n-+\t\telse if (!rt2x00_rt(rt2x00dev, RT6352))\n- \t\t\trt2800_bbp_write(rt2x00dev, 82, 0xf2);\n- \n- \t\tif (rt2x00_rt(rt2x00dev, RT3593))\n-@@ -3388,7 +3697,7 @@ static void rt2800_config_channel(struct\n- \tif (rt2x00_rt(rt2x00dev, RT3572))\n- \t\trt2800_rfcsr_write(rt2x00dev, 8, 0);\n- \n--\ttx_pin = 0;\n-+\trt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);\n- \n- \tswitch (rt2x00dev->default_ant.tx_chain_num) {\n- \tcase 3:\n-@@ -3437,6 +3746,7 @@ static void rt2800_config_channel(struct\n- \n- \trt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);\n- \trt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);\n-+\trt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1); /* mt7620 */\n- \n- \trt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);\n- \n-@@ -3495,7 +3805,7 @@ static void rt2800_config_channel(struct\n- \t\tusleep_range(1000, 1500);\n- \t}\n- \n--\tif (rt2x00_rt(rt2x00dev, RT5592)) {\n-+\tif (rt2x00_rt(rt2x00dev, RT5592) || rt2x00_rt(rt2x00dev, RT6352)) {\n- \t\trt2800_bbp_write(rt2x00dev, 195, 141);\n- \t\trt2800_bbp_write(rt2x00dev, 196, conf_is_ht40(conf) ? 0x10 : 0x1a);\n- \n-@@ -4182,6 +4492,128 @@ static void rt2800_config_txpower_rt3593\n- \t\t\t (unsigned long) regs[i]);\n- }\n- \n-+static void rt2800_config_txpower_rt6352(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t\t struct ieee80211_channel *chan,\n-+\t\t\t\t\t int power_level)\n-+{\n-+\tu32 reg, pwreg;\n-+\tu16 eeprom;\n-+\tu32 data, gdata;\n-+\tu8 t, i;\n-+\tenum nl80211_band band = chan->band;\n-+\tint delta;\n-+\n-+\t/* Warn user if bw_comp is set in EEPROM */\n-+\tdelta = rt2800_get_txpower_bw_comp(rt2x00dev, band);\n-+\n-+\tif (delta)\n-+\t\trt2x00_warn(rt2x00dev, \"ignoring EEPROM HT40 power delta: %d\\n\",\n-+\t\t\t delta);\n-+\n-+\t/* populate TX_PWR_CFG_0 up to TX_PWR_CFG_4 from EEPROM for HT20, limit\n-+\t * value to 0x3f and replace 0x20 by 0x21 as this is what the vendor\n-+\t * driver does as well, though it looks kinda wrong.\n-+\t * Maybe some misunderstanding of what a signed 8-bit value is? Maybe\n-+\t * the hardware has a problem handling 0x20, and as the code initially\n-+\t * used a fixed offset between HT20 and HT40 rates they had to work-\n-+\t * around that issue and most likely just forgot about it later on.\n-+\t * Maybe we should use rt2800_get_txpower_bw_comp() here as well,\n-+\t * however, the corresponding EEPROM value is not respected by the\n-+\t * vendor driver, so maybe this is rather being taken care of the\n-+\t * TXALC and the driver doesn't need to handle it...?\n-+\t * Though this is all very awkward, just do as they did, as that's what\n-+\t * board vendors expected when they populated the EEPROM...\n-+\t */\n-+\tfor (i = 0; i < 5; i++) {\n-+\t\trt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,\n-+\t\t\t\t\t i * 2, &eeprom);\n-+\n-+\t\tdata = eeprom;\n-+\n-+\t\tt = eeprom & 0x3f;\n-+\t\tif (t == 32)\n-+\t\t\tt++;\n-+\n-+\t\tgdata = t;\n-+\n-+\t\tt = (eeprom & 0x3f00) >> 8;\n-+\t\tif (t == 32)\n-+\t\t\tt++;\n-+\n-+\t\tgdata |= (t << 8);\n-+\n-+\t\trt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,\n-+\t\t\t\t\t (i * 2) + 1, &eeprom);\n-+\n-+\t\tt = eeprom & 0x3f;\n-+\t\tif (t == 32)\n-+\t\t\tt++;\n-+\n-+\t\tgdata |= (t << 16);\n-+\n-+\t\tt = (eeprom & 0x3f00) >> 8;\n-+\t\tif (t == 32)\n-+\t\t\tt++;\n-+\n-+\t\tgdata |= (t << 24);\n-+\t\tdata |= (eeprom << 16);\n-+\n-+\t\tif (!test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags)) {\n-+\t\t\t/* HT20 */\n-+\t\t\tif (data != 0xffffffff)\n-+\t\t\t\trt2800_register_write(rt2x00dev,\n-+\t\t\t\t\t\t TX_PWR_CFG_0 + (i * 4),\n-+\t\t\t\t\t\t data);\n-+\t\t} else {\n-+\t\t\t/* HT40 */\n-+\t\t\tif (gdata != 0xffffffff)\n-+\t\t\t\trt2800_register_write(rt2x00dev,\n-+\t\t\t\t\t\t TX_PWR_CFG_0 + (i * 4),\n-+\t\t\t\t\t\t gdata);\n-+\t\t}\n-+\t}\n-+\n-+\t/* Aparently Ralink ran out of space in the BYRATE calibration section\n-+\t * of the EERPOM which is copied to the corresponding TX_PWR_CFG_x\n-+\t * registers. As recent 2T chips use 8-bit instead of 4-bit values for\n-+\t * power-offsets more space would be needed. Ralink decided to keep the\n-+\t * EEPROM layout untouched and rather have some shared values covering\n-+\t * multiple bitrates.\n-+\t * Populate the registers not covered by the EEPROM in the same way the\n-+\t * vendor driver does.\n-+\t */\n-+\n-+\t/* For OFDM 54MBS use value from OFDM 48MBS */\n-+\tpwreg = 0;\n-+\trt2800_register_read(rt2x00dev, TX_PWR_CFG_1, ®);\n-+\tt = rt2x00_get_field32(reg, TX_PWR_CFG_1B_48MBS);\n-+\trt2x00_set_field32(&pwreg, TX_PWR_CFG_7B_54MBS, t);\n-+\n-+\t/* For MCS 7 use value from MCS 6 */\n-+\trt2800_register_read(rt2x00dev, TX_PWR_CFG_2, ®);\n-+\tt = rt2x00_get_field32(reg, TX_PWR_CFG_2B_MCS6_MCS7);\n-+\trt2x00_set_field32(&pwreg, TX_PWR_CFG_7B_MCS7, t);\n-+\trt2800_register_write(rt2x00dev, TX_PWR_CFG_7, pwreg);\n-+\n-+\t/* For MCS 15 use value from MCS 14 */\n-+\tpwreg = 0;\n-+\trt2800_register_read(rt2x00dev, TX_PWR_CFG_3, ®);\n-+\tt = rt2x00_get_field32(reg, TX_PWR_CFG_3B_MCS14);\n-+\trt2x00_set_field32(&pwreg, TX_PWR_CFG_8B_MCS15, t);\n-+\trt2800_register_write(rt2x00dev, TX_PWR_CFG_8, pwreg);\n-+\n-+\t/* For STBC MCS 7 use value from STBC MCS 6 */\n-+\tpwreg = 0;\n-+\trt2800_register_read(rt2x00dev, TX_PWR_CFG_4, ®);\n-+\tt = rt2x00_get_field32(reg, TX_PWR_CFG_4B_STBC_MCS6);\n-+\trt2x00_set_field32(&pwreg, TX_PWR_CFG_9B_STBC_MCS7, t);\n-+\trt2800_register_write(rt2x00dev, TX_PWR_CFG_9, pwreg);\n-+\n-+\trt2800_config_alc(rt2x00dev, chan, power_level);\n-+\n-+\t/* TODO: temperature compensation code! */\n-+}\n-+\n- /*\n- * We configure transmit power using MAC TX_PWR_CFG_{0,...,N} registers and\n- * BBP R1 register. TX_PWR_CFG_X allow to configure per rate TX power values,\n-@@ -4378,6 +4810,8 @@ static void rt2800_config_txpower(struct\n- {\n- \tif (rt2x00_rt(rt2x00dev, RT3593))\n- \t\trt2800_config_txpower_rt3593(rt2x00dev, chan, power_level);\n-+\telse if (rt2x00_rt(rt2x00dev, RT6352))\n-+\t\trt2800_config_txpower_rt6352(rt2x00dev, chan, power_level);\n- \telse\n- \t\trt2800_config_txpower_rt28xx(rt2x00dev, chan, power_level);\n- }\n-@@ -4393,6 +4827,7 @@ void rt2800_vco_calibration(struct rt2x0\n- {\n- \tu32\ttx_pin;\n- \tu8\trfcsr;\n-+\tunsigned long min_sleep = 0;\n- \n- \t/*\n- \t * A voltage-controlled oscillator(VCO) is an electronic oscillator\n-@@ -4431,6 +4866,15 @@ void rt2800_vco_calibration(struct rt2x0\n- \t\trt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);\n- \t\trt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);\n- \t\trt2800_rfcsr_write(rt2x00dev, 3, rfcsr);\n-+\t\tmin_sleep = 1000;\n-+\t\tbreak;\n-+\tcase RF7620:\n-+\t\trt2800_rfcsr_write(rt2x00dev, 5, 0x40);\n-+\t\trt2800_rfcsr_write(rt2x00dev, 4, 0x0C);\n-+\t\trt2800_rfcsr_read(rt2x00dev, 4, &rfcsr);\n-+\t\trt2x00_set_field8(&rfcsr, RFCSR4_VCOCAL_EN, 1);\n-+\t\trt2800_rfcsr_write(rt2x00dev, 4, rfcsr);\n-+\t\tmin_sleep = 2000;\n- \t\tbreak;\n- \tdefault:\n- \t\tWARN_ONCE(1, \"Not supported RF chipet %x for VCO recalibration\",\n-@@ -4438,7 +4882,8 @@ void rt2800_vco_calibration(struct rt2x0\n- \t\treturn;\n- \t}\n- \n--\tusleep_range(1000, 1500);\n-+\tif (min_sleep > 0)\n-+\t\tusleep_range(min_sleep, min_sleep * 2);\n- \n- \trt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);\n- \tif (rt2x00dev->rf_channel <= 14) {\n-@@ -4470,6 +4915,42 @@ void rt2800_vco_calibration(struct rt2x0\n- \t}\n- \trt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);\n- \n-+\tif (rt2x00_rt(rt2x00dev, RT6352)) {\n-+\t\tif (rt2x00dev->default_ant.tx_chain_num == 1) {\n-+\t\t\trt2800_bbp_write(rt2x00dev, 91, 0x07);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 95, 0x1A);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 195, 128);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 196, 0xA0);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 195, 170);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 196, 0x12);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 195, 171);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 196, 0x10);\n-+\t\t} else {\n-+\t\t\trt2800_bbp_write(rt2x00dev, 91, 0x06);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 95, 0x9A);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 195, 128);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 196, 0xE0);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 195, 170);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 196, 0x30);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 195, 171);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 196, 0x30);\n-+\t\t}\n-+\n-+\t\tif (rt2x00_has_cap_external_lna_bg(rt2x00dev)) {\n-+\t\t\trt2800_bbp_write(rt2x00dev, 75, 0x60);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 76, 0x44);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 79, 0x1C);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 80, 0x0C);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 82, 0xB6);\n-+\t\t}\n-+\n-+\t\t/* On 11A, We should delay and wait RF/BBP to be stable\n-+\t\t * and the appropriate time should be 1000 micro seconds\n-+\t\t * 2005/06/05 - On 11G, we also need this delay time.\n-+\t\t * Otherwise it's difficult to pass the WHQL.\n-+\t\t */\n-+\t\tusleep_range(1000, 1500);\n-+\t}\n- }\n- EXPORT_SYMBOL_GPL(rt2800_vco_calibration);\n- \n-@@ -4568,7 +5049,8 @@ static u8 rt2800_get_default_vgc(struct\n- \t\t rt2x00_rt(rt2x00dev, RT3593) ||\n- \t\t rt2x00_rt(rt2x00dev, RT5390) ||\n- \t\t rt2x00_rt(rt2x00dev, RT5392) ||\n--\t\t rt2x00_rt(rt2x00dev, RT5592))\n-+\t\t rt2x00_rt(rt2x00dev, RT5592) ||\n-+\t\t rt2x00_rt(rt2x00dev, RT6352))\n- \t\t\tvgc = 0x1c + (2 * rt2x00dev->lna_gain);\n- \t\telse\n- \t\t\tvgc = 0x2e + rt2x00dev->lna_gain;\n-@@ -4795,7 +5277,8 @@ static int rt2800_init_registers(struct\n- \t\t\t\t\t 0x00000000);\n- \t\t}\n- \t} else if (rt2x00_rt(rt2x00dev, RT5390) ||\n--\t\t rt2x00_rt(rt2x00dev, RT5392)) {\n-+\t\t rt2x00_rt(rt2x00dev, RT5392) ||\n-+\t\t rt2x00_rt(rt2x00dev, RT6352)) {\n- \t\trt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);\n- \t\trt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);\n- \t\trt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);\n-@@ -4805,6 +5288,24 @@ static int rt2800_init_registers(struct\n- \t\trt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);\n- \t} else if (rt2x00_rt(rt2x00dev, RT5350)) {\n- \t\trt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);\n-+\t} else if (rt2x00_rt(rt2x00dev, RT6352)) {\n-+\t\trt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000401);\n-+\t\trt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x000C0000);\n-+\t\trt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);\n-+\t\trt2800_register_write(rt2x00dev, MIMO_PS_CFG, 0x00000002);\n-+\t\trt2800_register_write(rt2x00dev, TX_PIN_CFG, 0x00150F0F);\n-+\t\trt2800_register_write(rt2x00dev, TX_ALC_VGA3, 0x06060606);\n-+\t\trt2800_register_write(rt2x00dev, TX0_BB_GAIN_ATTEN, 0x0);\n-+\t\trt2800_register_write(rt2x00dev, TX1_BB_GAIN_ATTEN, 0x0);\n-+\t\trt2800_register_write(rt2x00dev, TX0_RF_GAIN_ATTEN, 0x6C6C666C);\n-+\t\trt2800_register_write(rt2x00dev, TX1_RF_GAIN_ATTEN, 0x6C6C666C);\n-+\t\trt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,\n-+\t\t\t\t 0x3630363A);\n-+\t\trt2800_register_write(rt2x00dev, TX1_RF_GAIN_CORRECT,\n-+\t\t\t\t 0x3630363A);\n-+\t\trt2800_register_read(rt2x00dev, TX_ALC_CFG_1, ®);\n-+\t\trt2x00_set_field32(®, TX_ALC_CFG_1_ROS_BUSY_EN, 0);\n-+\t\trt2800_register_write(rt2x00dev, TX_ALC_CFG_1, reg);\n- \t} else {\n- \t\trt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);\n- \t\trt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);\n-@@ -5786,6 +6287,231 @@ static void rt2800_init_bbp_5592(struct\n- \t\trt2800_bbp_write(rt2x00dev, 103, 0xc0);\n- }\n- \n-+static void rt2800_bbp_glrt_write(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t const u8 reg, const u8 value)\n-+{\n-+\trt2800_bbp_write(rt2x00dev, 195, reg);\n-+\trt2800_bbp_write(rt2x00dev, 196, value);\n-+}\n-+\n-+static void rt2800_bbp_dcoc_write(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t const u8 reg, const u8 value)\n-+{\n-+\trt2800_bbp_write(rt2x00dev, 158, reg);\n-+\trt2800_bbp_write(rt2x00dev, 159, value);\n-+}\n-+\n-+static void rt2800_bbp_dcoc_read(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t const u8 reg, u8 *value)\n-+{\n-+\trt2800_bbp_write(rt2x00dev, 158, reg);\n-+\trt2800_bbp_read(rt2x00dev, 159, value);\n-+}\n-+\n-+static void rt2800_init_bbp_6352(struct rt2x00_dev *rt2x00dev)\n-+{\n-+\tu8 bbp;\n-+\n-+\t/* Apply Maximum Likelihood Detection (MLD) for 2 stream case */\n-+\trt2800_bbp_read(rt2x00dev, 105, &bbp);\n-+\trt2x00_set_field8(&bbp, BBP105_MLD,\n-+\t\t\t rt2x00dev->default_ant.rx_chain_num == 2);\n-+\trt2800_bbp_write(rt2x00dev, 105, bbp);\n-+\n-+\t/* Avoid data loss and CRC errors */\n-+\trt2800_bbp4_mac_if_ctrl(rt2x00dev);\n-+\n-+\t/* Fix I/Q swap issue */\n-+\trt2800_bbp_read(rt2x00dev, 1, &bbp);\n-+\tbbp |= 0x04;\n-+\trt2800_bbp_write(rt2x00dev, 1, bbp);\n-+\n-+\t/* BBP for G band */\n-+\trt2800_bbp_write(rt2x00dev, 3, 0x08);\n-+\trt2800_bbp_write(rt2x00dev, 4, 0x00); /* rt2800_bbp4_mac_if_ctrl? */\n-+\trt2800_bbp_write(rt2x00dev, 6, 0x08);\n-+\trt2800_bbp_write(rt2x00dev, 14, 0x09);\n-+\trt2800_bbp_write(rt2x00dev, 15, 0xFF);\n-+\trt2800_bbp_write(rt2x00dev, 16, 0x01);\n-+\trt2800_bbp_write(rt2x00dev, 20, 0x06);\n-+\trt2800_bbp_write(rt2x00dev, 21, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 22, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 27, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 28, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 30, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 31, 0x48);\n-+\trt2800_bbp_write(rt2x00dev, 47, 0x40);\n-+\trt2800_bbp_write(rt2x00dev, 62, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 63, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 64, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 65, 0x2C);\n-+\trt2800_bbp_write(rt2x00dev, 66, 0x1C);\n-+\trt2800_bbp_write(rt2x00dev, 67, 0x20);\n-+\trt2800_bbp_write(rt2x00dev, 68, 0xDD);\n-+\trt2800_bbp_write(rt2x00dev, 69, 0x10);\n-+\trt2800_bbp_write(rt2x00dev, 70, 0x05);\n-+\trt2800_bbp_write(rt2x00dev, 73, 0x18);\n-+\trt2800_bbp_write(rt2x00dev, 74, 0x0F);\n-+\trt2800_bbp_write(rt2x00dev, 75, 0x60);\n-+\trt2800_bbp_write(rt2x00dev, 76, 0x44);\n-+\trt2800_bbp_write(rt2x00dev, 77, 0x59);\n-+\trt2800_bbp_write(rt2x00dev, 78, 0x1E);\n-+\trt2800_bbp_write(rt2x00dev, 79, 0x1C);\n-+\trt2800_bbp_write(rt2x00dev, 80, 0x0C);\n-+\trt2800_bbp_write(rt2x00dev, 81, 0x3A);\n-+\trt2800_bbp_write(rt2x00dev, 82, 0xB6);\n-+\trt2800_bbp_write(rt2x00dev, 83, 0x9A);\n-+\trt2800_bbp_write(rt2x00dev, 84, 0x9A);\n-+\trt2800_bbp_write(rt2x00dev, 86, 0x38);\n-+\trt2800_bbp_write(rt2x00dev, 88, 0x90);\n-+\trt2800_bbp_write(rt2x00dev, 91, 0x04);\n-+\trt2800_bbp_write(rt2x00dev, 92, 0x02);\n-+\trt2800_bbp_write(rt2x00dev, 95, 0x9A);\n-+\trt2800_bbp_write(rt2x00dev, 96, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 103, 0xC0);\n-+\trt2800_bbp_write(rt2x00dev, 104, 0x92);\n-+\t/* FIXME BBP105 owerwrite */\n-+\trt2800_bbp_write(rt2x00dev, 105, 0x3C);\n-+\trt2800_bbp_write(rt2x00dev, 106, 0x12);\n-+\trt2800_bbp_write(rt2x00dev, 109, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 134, 0x10);\n-+\trt2800_bbp_write(rt2x00dev, 135, 0xA6);\n-+\trt2800_bbp_write(rt2x00dev, 137, 0x04);\n-+\trt2800_bbp_write(rt2x00dev, 142, 0x30);\n-+\trt2800_bbp_write(rt2x00dev, 143, 0xF7);\n-+\trt2800_bbp_write(rt2x00dev, 160, 0xEC);\n-+\trt2800_bbp_write(rt2x00dev, 161, 0xC4);\n-+\trt2800_bbp_write(rt2x00dev, 162, 0x77);\n-+\trt2800_bbp_write(rt2x00dev, 163, 0xF9);\n-+\trt2800_bbp_write(rt2x00dev, 164, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 165, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 186, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 187, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 188, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 186, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 187, 0x01);\n-+\trt2800_bbp_write(rt2x00dev, 188, 0x00);\n-+\trt2800_bbp_write(rt2x00dev, 189, 0x00);\n-+\n-+\trt2800_bbp_write(rt2x00dev, 91, 0x06);\n-+\trt2800_bbp_write(rt2x00dev, 92, 0x04);\n-+\trt2800_bbp_write(rt2x00dev, 93, 0x54);\n-+\trt2800_bbp_write(rt2x00dev, 99, 0x50);\n-+\trt2800_bbp_write(rt2x00dev, 148, 0x84);\n-+\trt2800_bbp_write(rt2x00dev, 167, 0x80);\n-+\trt2800_bbp_write(rt2x00dev, 178, 0xFF);\n-+\trt2800_bbp_write(rt2x00dev, 106, 0x13);\n-+\n-+\t/* BBP for G band GLRT function (BBP_128 ~ BBP_221) */\n-+\trt2800_bbp_glrt_write(rt2x00dev, 0, 0x00);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 1, 0x14);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 2, 0x20);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 3, 0x0A);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 10, 0x16);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 11, 0x06);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 12, 0x02);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 13, 0x07);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 14, 0x05);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 15, 0x09);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 16, 0x20);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 17, 0x08);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 18, 0x4A);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 19, 0x00);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 20, 0x00);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 128, 0xE0);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 129, 0x1F);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 130, 0x4F);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 131, 0x32);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 132, 0x08);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 133, 0x28);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 134, 0x19);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 135, 0x0A);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 138, 0x16);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 139, 0x10);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 140, 0x10);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 141, 0x1A);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 142, 0x36);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 143, 0x2C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 144, 0x26);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 145, 0x24);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 146, 0x42);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 147, 0x40);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 148, 0x30);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 149, 0x29);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 150, 0x4C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 151, 0x46);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 152, 0x3D);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 153, 0x40);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 154, 0x3E);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 155, 0x38);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 156, 0x3D);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 157, 0x2F);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 158, 0x3C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 159, 0x34);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 160, 0x2C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 161, 0x2F);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 162, 0x3C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 163, 0x35);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 164, 0x2E);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 165, 0x2F);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 166, 0x49);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 167, 0x41);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 168, 0x36);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 169, 0x39);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 170, 0x30);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 171, 0x30);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 172, 0x0E);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 173, 0x0D);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 174, 0x28);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 175, 0x21);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 176, 0x1C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 177, 0x16);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 178, 0x50);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 179, 0x4A);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 180, 0x43);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 181, 0x50);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 182, 0x10);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 183, 0x10);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 184, 0x10);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 185, 0x10);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 200, 0x7D);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 201, 0x14);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 202, 0x32);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 203, 0x2C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 204, 0x36);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 205, 0x4C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 206, 0x43);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 207, 0x2C);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 208, 0x2E);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 209, 0x36);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 210, 0x30);\n-+\trt2800_bbp_glrt_write(rt2x00dev, 211, 0x6E);\n-+\n-+\t/* BBP for G band DCOC function */\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 140, 0x0C);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 141, 0x00);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 142, 0x10);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 143, 0x10);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 144, 0x10);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 145, 0x10);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 146, 0x08);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 147, 0x40);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 148, 0x04);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 149, 0x04);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 150, 0x08);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 151, 0x08);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 152, 0x03);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 153, 0x03);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 154, 0x03);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 155, 0x02);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 156, 0x40);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 157, 0x40);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 158, 0x64);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 159, 0x64);\n-+\n-+\trt2800_bbp4_mac_if_ctrl(rt2x00dev);\n-+}\n-+\n- static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)\n- {\n- \tunsigned int i;\n-@@ -5830,6 +6556,9 @@ static void rt2800_init_bbp(struct rt2x0\n- \tcase RT5592:\n- \t\trt2800_init_bbp_5592(rt2x00dev);\n- \t\treturn;\n-+\tcase RT6352:\n-+\t\trt2800_init_bbp_6352(rt2x00dev);\n-+\t\tbreak;\n- \t}\n- \n- \tfor (i = 0; i < EEPROM_BBP_SIZE; i++) {\n-@@ -6901,6 +7630,615 @@ static void rt2800_init_rfcsr_5592(struc\n- \trt2800_led_open_drain_enable(rt2x00dev);\n- }\n- \n-+static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t bool set_bw, bool is_ht40)\n-+{\n-+\tu8 bbp_val;\n-+\n-+\trt2800_bbp_read(rt2x00dev, 21, &bbp_val);\n-+\tbbp_val |= 0x1;\n-+\trt2800_bbp_write(rt2x00dev, 21, bbp_val);\n-+\tusleep_range(100, 200);\n-+\n-+\tif (set_bw) {\n-+\t\trt2800_bbp_read(rt2x00dev, 4, &bbp_val);\n-+\t\trt2x00_set_field8(&bbp_val, BBP4_BANDWIDTH, 2 * is_ht40);\n-+\t\trt2800_bbp_write(rt2x00dev, 4, bbp_val);\n-+\t\tusleep_range(100, 200);\n-+\t}\n-+\n-+\trt2800_bbp_read(rt2x00dev, 21, &bbp_val);\n-+\tbbp_val &= (~0x1);\n-+\trt2800_bbp_write(rt2x00dev, 21, bbp_val);\n-+\tusleep_range(100, 200);\n-+}\n-+\n-+static int rt2800_rf_lp_config(struct rt2x00_dev *rt2x00dev, bool btxcal)\n-+{\n-+\tu8 rf_val;\n-+\n-+\tif (btxcal)\n-+\t\trt2800_register_write(rt2x00dev, RF_CONTROL0, 0x04);\n-+\telse\n-+\t\trt2800_register_write(rt2x00dev, RF_CONTROL0, 0x02);\n-+\n-+\trt2800_register_write(rt2x00dev, RF_BYPASS0, 0x06);\n-+\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 17, &rf_val);\n-+\trf_val |= 0x80;\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 17, rf_val);\n-+\n-+\tif (btxcal) {\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 18, 0xC1);\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 19, 0x20);\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 20, 0x02);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 3, &rf_val);\n-+\t\trf_val &= (~0x3F);\n-+\t\trf_val |= 0x3F;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 3, rf_val);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 4, &rf_val);\n-+\t\trf_val &= (~0x3F);\n-+\t\trf_val |= 0x3F;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 4, rf_val);\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 5, 0x31);\n-+\t} else {\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 18, 0xF1);\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 19, 0x18);\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 20, 0x02);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 3, &rf_val);\n-+\t\trf_val &= (~0x3F);\n-+\t\trf_val |= 0x34;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 3, rf_val);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 4, &rf_val);\n-+\t\trf_val &= (~0x3F);\n-+\t\trf_val |= 0x34;\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 4, rf_val);\n-+\t}\n-+\n-+\treturn 0;\n-+}\n-+\n-+static char rt2800_lp_tx_filter_bw_cal(struct rt2x00_dev *rt2x00dev)\n-+{\n-+\tunsigned int cnt;\n-+\tu8 bbp_val;\n-+\tchar cal_val;\n-+\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 0, 0x82);\n-+\n-+\tcnt = 0;\n-+\tdo {\n-+\t\tusleep_range(500, 2000);\n-+\t\trt2800_bbp_read(rt2x00dev, 159, &bbp_val);\n-+\t\tif (bbp_val == 0x02 || cnt == 20)\n-+\t\t\tbreak;\n-+\n-+\t\tcnt++;\n-+\t} while (cnt < 20);\n-+\n-+\trt2800_bbp_dcoc_read(rt2x00dev, 0x39, &bbp_val);\n-+\tcal_val = bbp_val & 0x7F;\n-+\tif (cal_val >= 0x40)\n-+\t\tcal_val -= 128;\n-+\n-+\treturn cal_val;\n-+}\n-+\n-+static void rt2800_bw_filter_calibration(struct rt2x00_dev *rt2x00dev,\n-+\t\t\t\t\t bool btxcal)\n-+{\n-+\tstruct rt2800_drv_data *drv_data = rt2x00dev->drv_data;\n-+\tu8 tx_agc_fc = 0, rx_agc_fc = 0, cmm_agc_fc;\n-+\tu8 filter_target;\n-+\tu8 tx_filter_target_20m = 0x09, tx_filter_target_40m = 0x02;\n-+\tu8 rx_filter_target_20m = 0x27, rx_filter_target_40m = 0x31;\n-+\tint loop = 0, is_ht40, cnt;\n-+\tu8 bbp_val, rf_val;\n-+\tchar cal_r32_init, cal_r32_val, cal_diff;\n-+\tu8 saverfb5r00, saverfb5r01, saverfb5r03, saverfb5r04, saverfb5r05;\n-+\tu8 saverfb5r06, saverfb5r07;\n-+\tu8 saverfb5r08, saverfb5r17, saverfb5r18, saverfb5r19, saverfb5r20;\n-+\tu8 saverfb5r37, saverfb5r38, saverfb5r39, saverfb5r40, saverfb5r41;\n-+\tu8 saverfb5r42, saverfb5r43, saverfb5r44, saverfb5r45, saverfb5r46;\n-+\tu8 saverfb5r58, saverfb5r59;\n-+\tu8 savebbp159r0, savebbp159r2, savebbpr23;\n-+\tu32 MAC_RF_CONTROL0, MAC_RF_BYPASS0;\n-+\n-+\t/* Save MAC registers */\n-+\trt2800_register_read(rt2x00dev, RF_CONTROL0, &MAC_RF_CONTROL0);\n-+\trt2800_register_read(rt2x00dev, RF_BYPASS0, &MAC_RF_BYPASS0);\n-+\n-+\t/* save BBP registers */\n-+\trt2800_bbp_read(rt2x00dev, 23, &savebbpr23);\n-+\n-+\trt2800_bbp_dcoc_read(rt2x00dev, 0, &savebbp159r0);\n-+\trt2800_bbp_dcoc_read(rt2x00dev, 2, &savebbp159r2);\n-+\n-+\t/* Save RF registers */\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 0, &saverfb5r00);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 1, &saverfb5r01);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 3, &saverfb5r03);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 4, &saverfb5r04);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 5, &saverfb5r05);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 6, &saverfb5r06);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 7, &saverfb5r07);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 8, &saverfb5r08);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 17, &saverfb5r17);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 18, &saverfb5r18);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 19, &saverfb5r19);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 20, &saverfb5r20);\n-+\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 37, &saverfb5r37);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 38, &saverfb5r38);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 39, &saverfb5r39);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 40, &saverfb5r40);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 41, &saverfb5r41);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 42, &saverfb5r42);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 43, &saverfb5r43);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 44, &saverfb5r44);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 45, &saverfb5r45);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 46, &saverfb5r46);\n-+\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 58, &saverfb5r58);\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 59, &saverfb5r59);\n-+\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 0, &rf_val);\n-+\trf_val |= 0x3;\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 0, rf_val);\n-+\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 1, &rf_val);\n-+\trf_val |= 0x1;\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 1, rf_val);\n-+\n-+\tcnt = 0;\n-+\tdo {\n-+\t\tusleep_range(500, 2000);\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 1, &rf_val);\n-+\t\tif (((rf_val & 0x1) == 0x00) || (cnt == 40))\n-+\t\t\tbreak;\n-+\t\tcnt++;\n-+\t} while (cnt < 40);\n-+\n-+\trt2800_rfcsr_read_bank(rt2x00dev, 5, 0, &rf_val);\n-+\trf_val &= (~0x3);\n-+\trf_val |= 0x1;\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 0, rf_val);\n-+\n-+\t/* I-3 */\n-+\trt2800_bbp_read(rt2x00dev, 23, &bbp_val);\n-+\tbbp_val &= (~0x1F);\n-+\tbbp_val |= 0x10;\n-+\trt2800_bbp_write(rt2x00dev, 23, bbp_val);\n-+\n-+\tdo {\n-+\t\t/* I-4,5,6,7,8,9 */\n-+\t\tif (loop == 0) {\n-+\t\t\tis_ht40 = false;\n-+\n-+\t\t\tif (btxcal)\n-+\t\t\t\tfilter_target = tx_filter_target_20m;\n-+\t\t\telse\n-+\t\t\t\tfilter_target = rx_filter_target_20m;\n-+\t\t} else {\n-+\t\t\tis_ht40 = true;\n-+\n-+\t\t\tif (btxcal)\n-+\t\t\t\tfilter_target = tx_filter_target_40m;\n-+\t\t\telse\n-+\t\t\t\tfilter_target = rx_filter_target_40m;\n-+\t\t}\n-+\n-+\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 8, &rf_val);\n-+\t\trf_val &= (~0x04);\n-+\t\tif (loop == 1)\n-+\t\t\trf_val |= 0x4;\n-+\n-+\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 8, rf_val);\n-+\n-+\t\trt2800_bbp_core_soft_reset(rt2x00dev, true, is_ht40);\n-+\n-+\t\trt2800_rf_lp_config(rt2x00dev, btxcal);\n-+\t\tif (btxcal) {\n-+\t\t\ttx_agc_fc = 0;\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 58, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 58, rf_val);\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 59, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 59, rf_val);\n-+\t\t} else {\n-+\t\t\trx_agc_fc = 0;\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 6, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 6, rf_val);\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 7, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 7, rf_val);\n-+\t\t}\n-+\n-+\t\tusleep_range(1000, 2000);\n-+\n-+\t\trt2800_bbp_dcoc_read(rt2x00dev, 2, &bbp_val);\n-+\t\tbbp_val &= (~0x6);\n-+\t\trt2800_bbp_dcoc_write(rt2x00dev, 2, bbp_val);\n-+\n-+\t\trt2800_bbp_core_soft_reset(rt2x00dev, false, is_ht40);\n-+\n-+\t\tcal_r32_init = rt2800_lp_tx_filter_bw_cal(rt2x00dev);\n-+\n-+\t\trt2800_bbp_dcoc_read(rt2x00dev, 2, &bbp_val);\n-+\t\tbbp_val |= 0x6;\n-+\t\trt2800_bbp_dcoc_write(rt2x00dev, 2, bbp_val);\n-+do_cal:\n-+\t\tif (btxcal) {\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 58, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trf_val |= tx_agc_fc;\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 58, rf_val);\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 59, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trf_val |= tx_agc_fc;\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 59, rf_val);\n-+\t\t} else {\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 6, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trf_val |= rx_agc_fc;\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 6, rf_val);\n-+\t\t\trt2800_rfcsr_read_bank(rt2x00dev, 5, 7, &rf_val);\n-+\t\t\trf_val &= (~0x7F);\n-+\t\t\trf_val |= rx_agc_fc;\n-+\t\t\trt2800_rfcsr_write_bank(rt2x00dev, 5, 7, rf_val);\n-+\t\t}\n-+\n-+\t\tusleep_range(500, 1000);\n-+\n-+\t\trt2800_bbp_core_soft_reset(rt2x00dev, false, is_ht40);\n-+\n-+\t\tcal_r32_val = rt2800_lp_tx_filter_bw_cal(rt2x00dev);\n-+\n-+\t\tcal_diff = cal_r32_init - cal_r32_val;\n-+\n-+\t\tif (btxcal)\n-+\t\t\tcmm_agc_fc = tx_agc_fc;\n-+\t\telse\n-+\t\t\tcmm_agc_fc = rx_agc_fc;\n-+\n-+\t\tif (((cal_diff > filter_target) && (cmm_agc_fc == 0)) ||\n-+\t\t ((cal_diff < filter_target) && (cmm_agc_fc == 0x3f))) {\n-+\t\t\tif (btxcal)\n-+\t\t\t\ttx_agc_fc = 0;\n-+\t\t\telse\n-+\t\t\t\trx_agc_fc = 0;\n-+\t\t} else if ((cal_diff <= filter_target) && (cmm_agc_fc < 0x3f)) {\n-+\t\t\tif (btxcal)\n-+\t\t\t\ttx_agc_fc++;\n-+\t\t\telse\n-+\t\t\t\trx_agc_fc++;\n-+\t\t\tgoto do_cal;\n-+\t\t}\n-+\n-+\t\tif (btxcal) {\n-+\t\t\tif (loop == 0)\n-+\t\t\t\tdrv_data->tx_calibration_bw20 = tx_agc_fc;\n-+\t\t\telse\n-+\t\t\t\tdrv_data->tx_calibration_bw40 = tx_agc_fc;\n-+\t\t} else {\n-+\t\t\tif (loop == 0)\n-+\t\t\t\tdrv_data->rx_calibration_bw20 = rx_agc_fc;\n-+\t\t\telse\n-+\t\t\t\tdrv_data->rx_calibration_bw40 = rx_agc_fc;\n-+\t\t}\n-+\n-+\t\tloop++;\n-+\t} while (loop <= 1);\n-+\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 0, saverfb5r00);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 1, saverfb5r01);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 3, saverfb5r03);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 4, saverfb5r04);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 5, saverfb5r05);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 6, saverfb5r06);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 7, saverfb5r07);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 8, saverfb5r08);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 17, saverfb5r17);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 18, saverfb5r18);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 19, saverfb5r19);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 20, saverfb5r20);\n-+\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 37, saverfb5r37);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 38, saverfb5r38);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 39, saverfb5r39);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 40, saverfb5r40);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 41, saverfb5r41);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 42, saverfb5r42);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 43, saverfb5r43);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 44, saverfb5r44);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 45, saverfb5r45);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 46, saverfb5r46);\n-+\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 58, saverfb5r58);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 5, 59, saverfb5r59);\n-+\n-+\trt2800_bbp_write(rt2x00dev, 23, savebbpr23);\n-+\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 0, savebbp159r0);\n-+\trt2800_bbp_dcoc_write(rt2x00dev, 2, savebbp159r2);\n-+\n-+\trt2800_bbp_read(rt2x00dev, 4, &bbp_val);\n-+\trt2x00_set_field8(&bbp_val, BBP4_BANDWIDTH,\n-+\t\t\t 2 * test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags));\n-+\trt2800_bbp_write(rt2x00dev, 4, bbp_val);\n-+\n-+\trt2800_register_write(rt2x00dev, RF_CONTROL0, MAC_RF_CONTROL0);\n-+\trt2800_register_write(rt2x00dev, RF_BYPASS0, MAC_RF_BYPASS0);\n-+}\n-+\n-+static void rt2800_init_rfcsr_6352(struct rt2x00_dev *rt2x00dev)\n-+{\n-+\t/* Initialize RF central register to default value */\n-+\trt2800_rfcsr_write(rt2x00dev, 0, 0x02);\n-+\trt2800_rfcsr_write(rt2x00dev, 1, 0x03);\n-+\trt2800_rfcsr_write(rt2x00dev, 2, 0x33);\n-+\trt2800_rfcsr_write(rt2x00dev, 3, 0xFF);\n-+\trt2800_rfcsr_write(rt2x00dev, 4, 0x0C);\n-+\trt2800_rfcsr_write(rt2x00dev, 5, 0x40);\n-+\trt2800_rfcsr_write(rt2x00dev, 6, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 7, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 8, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 9, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 10, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 11, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 12, rt2x00dev->freq_offset);\n-+\trt2800_rfcsr_write(rt2x00dev, 13, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 14, 0x40);\n-+\trt2800_rfcsr_write(rt2x00dev, 15, 0x22);\n-+\trt2800_rfcsr_write(rt2x00dev, 16, 0x4C);\n-+\trt2800_rfcsr_write(rt2x00dev, 17, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 18, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 19, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 20, 0xA0);\n-+\trt2800_rfcsr_write(rt2x00dev, 21, 0x12);\n-+\trt2800_rfcsr_write(rt2x00dev, 22, 0x07);\n-+\trt2800_rfcsr_write(rt2x00dev, 23, 0x13);\n-+\trt2800_rfcsr_write(rt2x00dev, 24, 0xFE);\n-+\trt2800_rfcsr_write(rt2x00dev, 25, 0x24);\n-+\trt2800_rfcsr_write(rt2x00dev, 26, 0x7A);\n-+\trt2800_rfcsr_write(rt2x00dev, 27, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 28, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 29, 0x05);\n-+\trt2800_rfcsr_write(rt2x00dev, 30, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 31, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 32, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 33, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 34, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 35, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 36, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 37, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 38, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 39, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 40, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 41, 0xD0);\n-+\trt2800_rfcsr_write(rt2x00dev, 42, 0x5B);\n-+\trt2800_rfcsr_write(rt2x00dev, 43, 0x00);\n-+\n-+\trt2800_rfcsr_write(rt2x00dev, 11, 0x21);\n-+\tif (rt2800_clk_is_20mhz(rt2x00dev))\n-+\t\trt2800_rfcsr_write(rt2x00dev, 13, 0x03);\n-+\telse\n-+\t\trt2800_rfcsr_write(rt2x00dev, 13, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 14, 0x7C);\n-+\trt2800_rfcsr_write(rt2x00dev, 16, 0x80);\n-+\trt2800_rfcsr_write(rt2x00dev, 17, 0x99);\n-+\trt2800_rfcsr_write(rt2x00dev, 18, 0x99);\n-+\trt2800_rfcsr_write(rt2x00dev, 19, 0x09);\n-+\trt2800_rfcsr_write(rt2x00dev, 20, 0x50);\n-+\trt2800_rfcsr_write(rt2x00dev, 21, 0xB0);\n-+\trt2800_rfcsr_write(rt2x00dev, 22, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 23, 0x06);\n-+\trt2800_rfcsr_write(rt2x00dev, 24, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 25, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 26, 0x5D);\n-+\trt2800_rfcsr_write(rt2x00dev, 27, 0x00);\n-+\trt2800_rfcsr_write(rt2x00dev, 28, 0x61);\n-+\trt2800_rfcsr_write(rt2x00dev, 29, 0xB5);\n-+\trt2800_rfcsr_write(rt2x00dev, 43, 0x02);\n-+\n-+\trt2800_rfcsr_write(rt2x00dev, 28, 0x62);\n-+\trt2800_rfcsr_write(rt2x00dev, 29, 0xAD);\n-+\trt2800_rfcsr_write(rt2x00dev, 39, 0x80);\n-+\n-+\t/* Initialize RF channel register to default value */\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 0, 0x03);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 1, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 2, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 3, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 4, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 5, 0x08);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 6, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 7, 0x51);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x53);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x16);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x61);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 12, 0x22);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 13, 0x3D);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 15, 0x13);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 16, 0x22);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x27);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 18, 0x02);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x01);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x52);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 22, 0x80);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 23, 0xB3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 24, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 25, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 26, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 27, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x5C);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0x6B);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 30, 0x6B);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 31, 0x31);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x5D);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 33, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xE6);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 35, 0x55);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 37, 0xBB);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 39, 0xB3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 40, 0x03);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 41, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 42, 0x00);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xB3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xD3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x07);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x68);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xEF);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1C);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x07);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xA8);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0x85);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x10);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x07);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6A);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0x85);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x10);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 62, 0x1C);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 63, 0x00);\n-+\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0xC5);\n-+\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x47);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x71);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x33);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x0E);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x23);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA4);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x02);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x12);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x1C);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0xEB);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x7D);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xD6);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x08);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB4);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xB3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x69);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFF);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x20);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xFF);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x1C);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x20);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xF7);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x09);\n-+\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x51);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x2C);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x64);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x51);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x36);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x16);\n-+\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x6C);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFC);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1F);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);\n-+\n-+\t/* Initialize RF channel register for DRQFN */\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xE3);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xE5);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x28);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x68);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xF7);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x02);\n-+\trt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xC7);\n-+\n-+\t/* Initialize RF DC calibration register to default value */\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 0, 0x47);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 1, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 2, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x10);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x10);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x04);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 9, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 10, 0x07);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 11, 0x01);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 12, 0x07);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 13, 0x07);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 14, 0x07);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 15, 0x20);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 16, 0x22);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 18, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 19, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 20, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 21, 0xF1);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 22, 0x11);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 23, 0x02);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 24, 0x41);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 25, 0x20);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 26, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 27, 0xD7);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 28, 0xA2);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 29, 0x20);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 30, 0x49);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 31, 0x20);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 32, 0x04);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 33, 0xF1);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 34, 0xA1);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 35, 0x01);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 41, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 42, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 43, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 44, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 45, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 46, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 47, 0x3E);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 48, 0x3D);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 49, 0x3E);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 50, 0x3D);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 51, 0x3E);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 52, 0x3D);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 53, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 54, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 55, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 56, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 57, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x10);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x10);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 60, 0x0A);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 61, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 62, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 63, 0x00);\n-+\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x08);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x04);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x20);\n-+\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);\n-+\trt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);\n-+\n-+\trt2800_bw_filter_calibration(rt2x00dev, true);\n-+\trt2800_bw_filter_calibration(rt2x00dev, false);\n-+}\n-+\n- static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)\n- {\n- \tif (rt2800_is_305x_soc(rt2x00dev)) {\n-@@ -6941,6 +8279,9 @@ static void rt2800_init_rfcsr(struct rt2\n- \tcase RT5592:\n- \t\trt2800_init_rfcsr_5592(rt2x00dev);\n- \t\tbreak;\n-+\tcase RT6352:\n-+\t\trt2800_init_rfcsr_6352(rt2x00dev);\n-+\t\tbreak;\n- \t}\n- }\n- \n-@@ -7307,7 +8648,8 @@ static int rt2800_init_eeprom(struct rt2\n- \t */\n- \tif (rt2x00_rt(rt2x00dev, RT3290) ||\n- \t rt2x00_rt(rt2x00dev, RT5390) ||\n--\t rt2x00_rt(rt2x00dev, RT5392))\n-+\t rt2x00_rt(rt2x00dev, RT5392) ||\n-+\t rt2x00_rt(rt2x00dev, RT6352))\n- \t\trt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);\n- \telse if (rt2x00_rt(rt2x00dev, RT3352))\n- \t\trf = RF3322;\n-@@ -7339,6 +8681,7 @@ static int rt2800_init_eeprom(struct rt2\n- \tcase RF5390:\n- \tcase RF5392:\n- \tcase RF5592:\n-+\tcase RF7620:\n- \t\tbreak;\n- \tdefault:\n- \t\trt2x00_err(rt2x00dev, \"Invalid RF chipset 0x%04x detected\\n\",\n-@@ -7746,6 +9089,23 @@ static const struct rf_channel rf_vals_5\n- \t{196, 83, 0, 12, 1},\n- };\n- \n-+static const struct rf_channel rf_vals_7620[] = {\n-+\t{1, 0x50, 0x99, 0x99, 1},\n-+\t{2, 0x50, 0x44, 0x44, 2},\n-+\t{3, 0x50, 0xEE, 0xEE, 2},\n-+\t{4, 0x50, 0x99, 0x99, 3},\n-+\t{5, 0x51, 0x44, 0x44, 0},\n-+\t{6, 0x51, 0xEE, 0xEE, 0},\n-+\t{7, 0x51, 0x99, 0x99, 1},\n-+\t{8, 0x51, 0x44, 0x44, 2},\n-+\t{9, 0x51, 0xEE, 0xEE, 2},\n-+\t{10, 0x51, 0x99, 0x99, 3},\n-+\t{11, 0x52, 0x44, 0x44, 0},\n-+\t{12, 0x52, 0xEE, 0xEE, 0},\n-+\t{13, 0x52, 0x99, 0x99, 1},\n-+\t{14, 0x52, 0x33, 0x33, 3},\n-+};\n-+\n- static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)\n- {\n- \tstruct hw_mode_spec *spec = &rt2x00dev->spec;\n-@@ -7849,6 +9209,11 @@ static int rt2800_probe_hw_mode(struct r\n- \t\t\tspec->channels = rf_vals_3x;\n- \t\tbreak;\n- \n-+\tcase RF7620:\n-+\t\tspec->num_channels = ARRAY_SIZE(rf_vals_7620);\n-+\t\tspec->channels = rf_vals_7620;\n-+\t\tbreak;\n-+\n- \tcase RF3052:\n- \tcase RF3053:\n- \t\tspec->num_channels = ARRAY_SIZE(rf_vals_3x);\n-@@ -7980,6 +9345,7 @@ static int rt2800_probe_hw_mode(struct r\n- \tcase RF5390:\n- \tcase RF5392:\n- \tcase RF5592:\n-+\tcase RF7620:\n- \t\t__set_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags);\n- \t\tbreak;\n- \t}\n-@@ -8024,6 +9390,9 @@ static int rt2800_probe_rt(struct rt2x00\n- \t\treturn -ENODEV;\n- \t}\n- \n-+\tif (rt == RT5390 && rt2x00_is_soc(rt2x00dev))\n-+\t\trt = RT6352;\n-+\n- \trt2x00_set_rt(rt2x00dev, rt, rev);\n- \n- \treturn 0;\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h\n-@@ -33,6 +33,10 @@\n- struct rt2800_drv_data {\n- \tu8 calibration_bw20;\n- \tu8 calibration_bw40;\n-+\tchar rx_calibration_bw20;\n-+\tchar rx_calibration_bw40;\n-+\tchar tx_calibration_bw20;\n-+\tchar tx_calibration_bw40;\n- \tu8 bbp25;\n- \tu8 bbp26;\n- \tu8 txmixer_gain_24g;\n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-@@ -174,6 +174,7 @@ struct rt2x00_chip {\n- #define RT5390\t\t0x5390 /* 2.4GHz */\n- #define RT5392\t\t0x5392 /* 2.4GHz */\n- #define RT5592\t\t0x5592\n-+#define RT6352\t\t0x6352 /* WSOC 2.4GHz */\n- \n- \tu16 rf;\n- \tu16 rev;\ndiff --git a/package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch b/package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch\ndeleted file mode 100644\nindex 7994456de7..0000000000\n--- a/package/kernel/mac80211/patches/020-20-rt2x00-reverse-external-PA-capability-flag-logic.patch\n+++ /dev/null\n@@ -1,121 +0,0 @@\n-From 1f242a3de702d5a19c479685d35b050837122724 Mon Sep 17 00:00:00 2001\n-From: Daniel Golle \n-Date: Mon, 10 Apr 2017 15:29:45 +0200\n-Subject: [PATCH] rt2x00: reverse external PA capability flag logic\n-\n-Consequently refer to external PA instead of inverting the logic and\n-use an internal PA capability flag which is a bit confusing.\n-Currently this is used for Rt3352 only, but MT7620A also allows for an\n-external PA which will be supported by a follow up patch.\n-\n-Signed-off-by: Daniel Golle \n-Acked-by: Stanislaw Gruszka \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 40 +++++++++++++-------------\n- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 +--\n- 2 files changed, 22 insertions(+), 22 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -7014,9 +7014,9 @@ static void rt2800_init_rfcsr_3290(struc\n- \n- static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)\n- {\n--\tint tx0_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX0,\n-+\tint tx0_ext_pa = test_bit(CAPABILITY_EXTERNAL_PA_TX0,\n- \t\t\t\t &rt2x00dev->cap_flags);\n--\tint tx1_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX1,\n-+\tint tx1_ext_pa = test_bit(CAPABILITY_EXTERNAL_PA_TX1,\n- \t\t\t\t &rt2x00dev->cap_flags);\n- \tu8 rfcsr;\n- \n-@@ -7056,9 +7056,9 @@ static void rt2800_init_rfcsr_3352(struc\n- \trt2800_rfcsr_write(rt2x00dev, 32, 0x80);\n- \trt2800_rfcsr_write(rt2x00dev, 33, 0x00);\n- \trfcsr = 0x01;\n--\tif (!tx0_int_pa)\n-+\tif (tx0_ext_pa)\n- \t\trt2x00_set_field8(&rfcsr, RFCSR34_TX0_EXT_PA, 1);\n--\tif (!tx1_int_pa)\n-+\tif (tx1_ext_pa)\n- \t\trt2x00_set_field8(&rfcsr, RFCSR34_TX1_EXT_PA, 1);\n- \trt2800_rfcsr_write(rt2x00dev, 34, rfcsr);\n- \trt2800_rfcsr_write(rt2x00dev, 35, 0x03);\n-@@ -7068,13 +7068,13 @@ static void rt2800_init_rfcsr_3352(struc\n- \trt2800_rfcsr_write(rt2x00dev, 39, 0xc5);\n- \trt2800_rfcsr_write(rt2x00dev, 40, 0x33);\n- \trfcsr = 0x52;\n--\tif (tx0_int_pa) {\n-+\tif (!tx0_ext_pa) {\n- \t\trt2x00_set_field8(&rfcsr, RFCSR41_BIT1, 1);\n- \t\trt2x00_set_field8(&rfcsr, RFCSR41_BIT4, 1);\n- \t}\n- \trt2800_rfcsr_write(rt2x00dev, 41, rfcsr);\n- \trfcsr = 0x52;\n--\tif (tx1_int_pa) {\n-+\tif (!tx1_ext_pa) {\n- \t\trt2x00_set_field8(&rfcsr, RFCSR42_BIT1, 1);\n- \t\trt2x00_set_field8(&rfcsr, RFCSR42_BIT4, 1);\n- \t}\n-@@ -7087,19 +7087,19 @@ static void rt2800_init_rfcsr_3352(struc\n- \trt2800_rfcsr_write(rt2x00dev, 48, 0x14);\n- \trt2800_rfcsr_write(rt2x00dev, 49, 0x00);\n- \trfcsr = 0x2d;\n--\tif (!tx0_int_pa)\n-+\tif (tx0_ext_pa)\n- \t\trt2x00_set_field8(&rfcsr, RFCSR50_TX0_EXT_PA, 1);\n--\tif (!tx1_int_pa)\n-+\tif (tx1_ext_pa)\n- \t\trt2x00_set_field8(&rfcsr, RFCSR50_TX1_EXT_PA, 1);\n- \trt2800_rfcsr_write(rt2x00dev, 50, rfcsr);\n--\trt2800_rfcsr_write(rt2x00dev, 51, (tx0_int_pa ? 0x7f : 0x52));\n--\trt2800_rfcsr_write(rt2x00dev, 52, (tx0_int_pa ? 0x00 : 0xc0));\n--\trt2800_rfcsr_write(rt2x00dev, 53, (tx0_int_pa ? 0x52 : 0xd2));\n--\trt2800_rfcsr_write(rt2x00dev, 54, (tx0_int_pa ? 0x1b : 0xc0));\n--\trt2800_rfcsr_write(rt2x00dev, 55, (tx1_int_pa ? 0x7f : 0x52));\n--\trt2800_rfcsr_write(rt2x00dev, 56, (tx1_int_pa ? 0x00 : 0xc0));\n--\trt2800_rfcsr_write(rt2x00dev, 57, (tx0_int_pa ? 0x52 : 0x49));\n--\trt2800_rfcsr_write(rt2x00dev, 58, (tx1_int_pa ? 0x1b : 0xc0));\n-+\trt2800_rfcsr_write(rt2x00dev, 51, (tx0_ext_pa ? 0x52 : 0x7f));\n-+\trt2800_rfcsr_write(rt2x00dev, 52, (tx0_ext_pa ? 0xc0 : 0x00));\n-+\trt2800_rfcsr_write(rt2x00dev, 53, (tx0_ext_pa ? 0xd2 : 0x52));\n-+\trt2800_rfcsr_write(rt2x00dev, 54, (tx0_ext_pa ? 0xc0 : 0x1b));\n-+\trt2800_rfcsr_write(rt2x00dev, 55, (tx1_ext_pa ? 0x52 : 0x7f));\n-+\trt2800_rfcsr_write(rt2x00dev, 56, (tx1_ext_pa ? 0xc0 : 0x00));\n-+\trt2800_rfcsr_write(rt2x00dev, 57, (tx0_ext_pa ? 0x49 : 0x52));\n-+\trt2800_rfcsr_write(rt2x00dev, 58, (tx1_ext_pa ? 0xc0 : 0x1b));\n- \trt2800_rfcsr_write(rt2x00dev, 59, 0x00);\n- \trt2800_rfcsr_write(rt2x00dev, 60, 0x00);\n- \trt2800_rfcsr_write(rt2x00dev, 61, 0x00);\n-@@ -8782,13 +8782,13 @@ static int rt2800_init_eeprom(struct rt2\n- \trt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);\n- \n- \tif (rt2x00_rt(rt2x00dev, RT3352)) {\n--\t\tif (!rt2x00_get_field16(eeprom,\n-+\t\tif (rt2x00_get_field16(eeprom,\n- \t\t EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))\n--\t\t __set_bit(CAPABILITY_INTERNAL_PA_TX0,\n-+\t\t __set_bit(CAPABILITY_EXTERNAL_PA_TX0,\n- \t\t\t &rt2x00dev->cap_flags);\n--\t\tif (!rt2x00_get_field16(eeprom,\n-+\t\tif (rt2x00_get_field16(eeprom,\n- \t\t EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352))\n--\t\t __set_bit(CAPABILITY_INTERNAL_PA_TX1,\n-+\t\t __set_bit(CAPABILITY_EXTERNAL_PA_TX1,\n- \t\t\t &rt2x00dev->cap_flags);\n- \t}\n- \n---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h\n-@@ -719,8 +719,8 @@ enum rt2x00_capability_flags {\n- \tCAPABILITY_DOUBLE_ANTENNA,\n- \tCAPABILITY_BT_COEXIST,\n- \tCAPABILITY_VCO_RECALIBRATION,\n--\tCAPABILITY_INTERNAL_PA_TX0,\n--\tCAPABILITY_INTERNAL_PA_TX1,\n-+\tCAPABILITY_EXTERNAL_PA_TX0,\n-+\tCAPABILITY_EXTERNAL_PA_TX1,\n- };\n- \n- /*\ndiff --git a/package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch b/package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch\ndeleted file mode 100644\nindex 71a4ffea45..0000000000\n--- a/package/kernel/mac80211/patches/020-21-rt2800-fix-LNA-gain-assignment-for-MT7620.patch\n+++ /dev/null\n@@ -1,49 +0,0 @@\n-From 0109238d62a99ea779a7e28e21868118e7b8d69d Mon Sep 17 00:00:00 2001\n-From: Daniel Golle \n-Date: Mon, 10 Apr 2017 14:28:14 +0200\n-Subject: [PATCH 1/2] rt2800: fix LNA gain assignment for MT7620\n-To: Stanislaw Gruszka \n-Cc: Helmut Schaa ,\n- linux-wireless@vger.kernel.org,\n- Kalle Valo \n-\n-The base value used for MT7620 differs from Rt5392 which resulted in\n-quite bad RX signal quality. Fix this by using the correct base value as\n-well as the LNA calibration values for HT20.\n-\n-Reported-by: Tom Psyborg \n-Signed-off-by: Daniel Golle \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 18 ++++++++++++++++--\n- 1 file changed, 16 insertions(+), 2 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -3806,11 +3806,25 @@ static void rt2800_config_channel(struct\n- \t}\n- \n- \tif (rt2x00_rt(rt2x00dev, RT5592) || rt2x00_rt(rt2x00dev, RT6352)) {\n-+\t\treg = 0x10;\n-+\t\tif (!conf_is_ht40(conf)) {\n-+\t\t\tif (rt2x00_rt(rt2x00dev, RT6352) &&\n-+\t\t\t rt2x00_has_cap_external_lna_bg(rt2x00dev)) {\n-+\t\t\t\treg |= 0x5;\n-+\t\t\t} else {\n-+\t\t\t\treg |= 0xa;\n-+\t\t\t}\n-+\t\t}\n- \t\trt2800_bbp_write(rt2x00dev, 195, 141);\n--\t\trt2800_bbp_write(rt2x00dev, 196, conf_is_ht40(conf) ? 0x10 : 0x1a);\n-+\t\trt2800_bbp_write(rt2x00dev, 196, reg);\n- \n- \t\t/* AGC init */\n--\t\treg = (rf->channel <= 14 ? 0x1c : 0x24) + 2 * rt2x00dev->lna_gain;\n-+\t\tif (rt2x00_rt(rt2x00dev, RT6352))\n-+\t\t\treg = 0x04;\n-+\t\telse\n-+\t\t\treg = rf->channel <= 14 ? 0x1c : 0x24;\n-+\n-+\t\treg += 2 * rt2x00dev->lna_gain;\n- \t\trt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);\n- \n- \t\trt2800_iq_calibrate(rt2x00dev, rf->channel);\ndiff --git a/package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch b/package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch\ndeleted file mode 100644\nindex 3d76408cd2..0000000000\n--- a/package/kernel/mac80211/patches/020-22-rt2800-do-VCO-calibration-after-programming-ALC.patch\n+++ /dev/null\n@@ -1,29 +0,0 @@\n-From feb608c7986c14bab153f31f8e96f251072e6578 Mon Sep 17 00:00:00 2001\n-From: Daniel Golle \n-Date: Mon, 10 Apr 2017 15:33:20 +0200\n-Subject: [PATCH 2/2] rt2800: do VCO calibration after programming ALC\n-To: Stanislaw Gruszka \n-Cc: Helmut Schaa ,\n- linux-wireless@vger.kernel.org,\n- Kalle Valo \n-\n-Scanning fails if we don't do VCO calibration every time.\n-The vendor driver duplicates the VCO calibration function into the\n-channel switching logic, we can do the same with less duplication.\n-\n-Signed-off-by: Daniel Golle \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 ++\n- 1 file changed, 2 insertions(+)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -3407,6 +3407,8 @@ static void rt2800_config_alc(struct rt2\n- \t\t\trt2800_rfcsr_write(rt2x00dev, 42, 0x5b);\n- \t}\n- \trt2800_register_write(rt2x00dev, MAC_SYS_CTRL, mac_sys_ctrl);\n-+\n-+\trt2800_vco_calibration(rt2x00dev);\n- }\n- \n- static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev,\ndiff --git a/package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch b/package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch\ndeleted file mode 100644\nindex 360d06e8f8..0000000000\n--- a/package/kernel/mac80211/patches/020-23-rt2800-fix-mt7620-vco-calibration-registers.patch\n+++ /dev/null\n@@ -1,45 +0,0 @@\n-From 02c452f317b4a4d06c433c294e66896a389731c1 Mon Sep 17 00:00:00 2001\n-From: Daniel Golle \n-Date: Tue, 18 Apr 2017 11:09:53 +0200\n-Subject: [PATCH] rt2800: fix mt7620 vco calibration registers\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-To: Stanislaw Gruszka \n-Cc: Helmut Schaa ,\n- linux-wireless@vger.kernel.org,\n- Kalle Valo ,\n- Tom Psyborg \n-\n-Use register values from init LNA function instead of the ones from\n-restore LNA function. Apply register values based on rx path\n-configuration.\n-\n-Signed-off-by: Tomislav Požega \n-Signed-off-by: Daniel Golle \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 +++---\n- 1 file changed, 3 insertions(+), 3 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -4932,7 +4932,7 @@ void rt2800_vco_calibration(struct rt2x0\n- \trt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);\n- \n- \tif (rt2x00_rt(rt2x00dev, RT6352)) {\n--\t\tif (rt2x00dev->default_ant.tx_chain_num == 1) {\n-+\t\tif (rt2x00dev->default_ant.rx_chain_num == 1) {\n- \t\t\trt2800_bbp_write(rt2x00dev, 91, 0x07);\n- \t\t\trt2800_bbp_write(rt2x00dev, 95, 0x1A);\n- \t\t\trt2800_bbp_write(rt2x00dev, 195, 128);\n-@@ -4953,8 +4953,8 @@ void rt2800_vco_calibration(struct rt2x0\n- \t\t}\n- \n- \t\tif (rt2x00_has_cap_external_lna_bg(rt2x00dev)) {\n--\t\t\trt2800_bbp_write(rt2x00dev, 75, 0x60);\n--\t\t\trt2800_bbp_write(rt2x00dev, 76, 0x44);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 75, 0x68);\n-+\t\t\trt2800_bbp_write(rt2x00dev, 76, 0x4C);\n- \t\t\trt2800_bbp_write(rt2x00dev, 79, 0x1C);\n- \t\t\trt2800_bbp_write(rt2x00dev, 80, 0x0C);\n- \t\t\trt2800_bbp_write(rt2x00dev, 82, 0xB6);\ndiff --git a/package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch b/package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch\ndeleted file mode 100644\nindex 92c2134845..0000000000\n--- a/package/kernel/mac80211/patches/020-24-rt2800-fix-mt7620-E2-channel-registers.patch\n+++ /dev/null\n@@ -1,36 +0,0 @@\n-From c426cb0ed15ee12dfdc8c53ddd1449ac617023cf Mon Sep 17 00:00:00 2001\n-From: Daniel Golle \n-Date: Tue, 18 Apr 2017 11:45:37 +0200\n-Subject: [PATCH] rt2800: fix mt7620 E2 channel registers\n-To: Stanislaw Gruszka \n-Cc: Helmut Schaa ,\n- linux-wireless@vger.kernel.org,\n- Kalle Valo ,\n- Tom Psyborg \n-\n-From: Tomislav Požega \n-\n-update RF register 47 and 54 values according to vendor driver\n-\n-Signed-off-by: Tomislav Požega \n-Signed-off-by: Daniel Golle \n----\n- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 ++++--\n- 1 file changed, 4 insertions(+), 2 deletions(-)\n-\n---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -8145,9 +8145,11 @@ static void rt2800_init_rfcsr_6352(struc\n- \trt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xB3);\n- \trt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);\n- \trt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);\n--\trt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x69);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 4, 47, 0x67);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 6, 47, 0x69);\n- \trt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFF);\n--\trt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x20);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 4, 54, 0x27);\n-+\trt2800_rfcsr_write_bank(rt2x00dev, 6, 54, 0x20);\n- \trt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);\n- \trt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xFF);\n- \trt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x1C);\ndiff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch\nindex 527938f015..0825373f15 100644\n--- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch\n+++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch\n@@ -1,6 +1,6 @@\n---- a/.local-symbols\n-+++ b/.local-symbols\n-@@ -482,45 +482,6 @@ USB_IPHETH=\n+--- a/local-symbols\n++++ b/local-symbols\n+@@ -380,45 +380,6 @@ USB_IPHETH=\n USB_SIERRA_NET=\n USB_VL600=\n USB_NET_CH9200=\n@@ -48,7 +48,7 @@\n NFC_NCI=\n --- a/drivers/net/wireless/broadcom/b43/main.c\n +++ b/drivers/net/wireless/broadcom/b43/main.c\n-@@ -2866,7 +2866,7 @@ static struct ssb_device *b43_ssb_gpio_d\n+@@ -2876,7 +2876,7 @@ static struct ssb_device *b43_ssb_gpio_d\n {\n \tstruct ssb_bus *bus = dev->dev->sdev->bus;\n \n@@ -57,7 +57,7 @@\n \treturn (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);\n #else\n \treturn bus->chipco.dev;\n-@@ -4883,7 +4883,7 @@ static int b43_wireless_core_init(struct\n+@@ -4893,7 +4893,7 @@ static int b43_wireless_core_init(struct\n \t}\n \tif (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)\n \t\thf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */\n@@ -110,7 +110,7 @@\n --- a/Kconfig.sources\n +++ b/Kconfig.sources\n @@ -9,9 +9,6 @@ source \"$BACKPORT_DIR/drivers/net/wirele\n- source \"$BACKPORT_DIR/drivers/net/ethernet/Kconfig\"\n+ #source \"$BACKPORT_DIR/drivers/net/ethernet/Kconfig\"\n source \"$BACKPORT_DIR/drivers/net/usb/Kconfig\"\n \n -source \"$BACKPORT_DIR/drivers/ssb/Kconfig\"\n@@ -118,15 +118,15 @@\n -\n source \"$BACKPORT_DIR/net/nfc/Kconfig\"\n \n- source \"$BACKPORT_DIR/drivers/media/Kconfig\"\n+ #source \"$BACKPORT_DIR/drivers/media/Kconfig\"\n --- a/Makefile.kernel\n +++ b/Makefile.kernel\n-@@ -38,8 +38,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/\n+@@ -39,8 +39,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/\n obj-$(CPTCFG_WLAN) += drivers/net/wireless/\n- obj-$(CPTCFG_BT) += net/bluetooth/\n- obj-$(CPTCFG_BT) += drivers/bluetooth/\n+ #obj-$(CPTCFG_BT) += net/bluetooth/\n+ #obj-$(CPTCFG_BT) += drivers/bluetooth/\n -obj-$(CPTCFG_SSB) += drivers/ssb/\n -obj-$(CPTCFG_BCMA) += drivers/bcma/\n- obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/\n+ #obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/\n obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/\n obj-$(CPTCFG_NFC) += net/nfc/\ndiff --git a/package/kernel/mac80211/patches/080-ath10k_thermal_config.patch b/package/kernel/mac80211/patches/080-ath10k_thermal_config.patch\nindex e08fa32a3b..7a5bd59573 100644\n--- a/package/kernel/mac80211/patches/080-ath10k_thermal_config.patch\n+++ b/package/kernel/mac80211/patches/080-ath10k_thermal_config.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath10k/Kconfig\n +++ b/drivers/net/wireless/ath/ath10k/Kconfig\n-@@ -48,6 +48,12 @@ config ATH10K_TRACING\n+@@ -57,6 +57,12 @@ config ATH10K_TRACING\n \t---help---\n \t Select this to ath10k use tracing infrastructure.\n \ndiff --git a/package/kernel/mac80211/patches/090-remove-cred.patch b/package/kernel/mac80211/patches/090-remove-cred.patch\ndeleted file mode 100644\nindex 3adb2afb86..0000000000\n--- a/package/kernel/mac80211/patches/090-remove-cred.patch\n+++ /dev/null\n@@ -1,15 +0,0 @@\n-This is only needed for kernel < 2.6.29 and conflicts with kernel 4.4.42\n-\n---- a/backport-include/linux/cred.h\n-+++ /dev/null\n-@@ -1,10 +0,0 @@\n--#ifndef __BACKPORT_LINUX_CRED_H\n--#define __BACKPORT_LINUX_CRED_H\n--#include_next \n--#include \n--\n--#ifndef current_user_ns\n--#define current_user_ns()\t(current->nsproxy->user_ns)\n--#endif\n--\n--#endif /* __BACKPORT_LINUX_CRED_H */\ndiff --git a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch\nindex 95fea441a4..5a4f1411b3 100644\n--- a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch\n+++ b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch\n@@ -1,11 +1,12 @@\n --- a/net/mac80211/Kconfig\n +++ b/net/mac80211/Kconfig\n-@@ -5,8 +5,6 @@ config MAC80211\n+@@ -5,9 +5,6 @@ config MAC80211\n \tdepends on CRYPTO\n \tdepends on CRYPTO_ARC4\n \tdepends on CRYPTO_AES\n -\tselect BPAUTO_CRYPTO_CCM\n -\tdepends on CRYPTO_GCM\n+-\tdepends on CRYPTO_CMAC\n \tdepends on CRC32\n \t---help---\n \t This option enables the hardware independent IEEE 802.11\n@@ -275,7 +276,7 @@\n \t\tstruct {\n --- a/net/mac80211/wpa.c\n +++ b/net/mac80211/wpa.c\n-@@ -305,7 +305,8 @@ ieee80211_crypto_tkip_decrypt(struct iee\n+@@ -306,7 +306,8 @@ ieee80211_crypto_tkip_decrypt(struct iee\n }\n \n \n@@ -285,7 +286,7 @@\n {\n \t__le16 mask_fc;\n \tint a4_included, mgmt;\n-@@ -335,14 +336,8 @@ static void ccmp_special_blocks(struct s\n+@@ -336,14 +337,8 @@ static void ccmp_special_blocks(struct s\n \telse\n \t\tqos_tid = 0;\n \n@@ -302,7 +303,7 @@\n \n \t/* Nonce: Nonce Flags | A2 | PN\n \t * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)\n-@@ -350,6 +345,8 @@ static void ccmp_special_blocks(struct s\n+@@ -351,6 +346,8 @@ static void ccmp_special_blocks(struct s\n \tb_0[1] = qos_tid | (mgmt << 4);\n \tmemcpy(&b_0[2], hdr->addr2, ETH_ALEN);\n \tmemcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);\n@@ -311,7 +312,7 @@\n \n \t/* AAD (extra authenticate-only data) / masked 802.11 header\n \t * FC | A1 | A2 | A3 | SC | [A4] | [QC] */\n-@@ -406,7 +403,7 @@ static int ccmp_encrypt_skb(struct ieee8\n+@@ -407,7 +404,7 @@ static int ccmp_encrypt_skb(struct ieee8\n \tu8 *pos;\n \tu8 pn[6];\n \tu64 pn64;\n@@ -320,7 +321,7 @@\n \tu8 b_0[AES_BLOCK_SIZE];\n \n \tif (info->control.hw_key &&\n-@@ -461,9 +458,11 @@ static int ccmp_encrypt_skb(struct ieee8\n+@@ -462,9 +459,11 @@ static int ccmp_encrypt_skb(struct ieee8\n \t\treturn 0;\n \n \tpos += IEEE80211_CCMP_HDR_LEN;\n@@ -335,7 +336,7 @@\n }\n \n \n-@@ -536,7 +535,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee\n+@@ -537,7 +536,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee\n \t\t\tu8 aad[2 * AES_BLOCK_SIZE];\n \t\t\tu8 b_0[AES_BLOCK_SIZE];\n \t\t\t/* hardware didn't decrypt/verify MIC */\n@@ -344,7 +345,7 @@\n \n \t\t\tif (ieee80211_aes_ccm_decrypt(\n \t\t\t\t key->u.ccmp.tfm, b_0, aad,\n-@@ -638,7 +637,7 @@ static int gcmp_encrypt_skb(struct ieee8\n+@@ -639,7 +638,7 @@ static int gcmp_encrypt_skb(struct ieee8\n \tu8 *pos;\n \tu8 pn[6];\n \tu64 pn64;\n@@ -353,7 +354,7 @@\n \tu8 j_0[AES_BLOCK_SIZE];\n \n \tif (info->control.hw_key &&\n-@@ -695,8 +694,10 @@ static int gcmp_encrypt_skb(struct ieee8\n+@@ -696,8 +695,10 @@ static int gcmp_encrypt_skb(struct ieee8\n \n \tpos += IEEE80211_GCMP_HDR_LEN;\n \tgcmp_special_blocks(skb, pn, j_0, aad);\n@@ -366,7 +367,7 @@\n }\n \n ieee80211_tx_result\n-@@ -1120,9 +1121,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct\n+@@ -1121,9 +1122,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct\n \tstruct ieee80211_key *key = tx->key;\n \tstruct ieee80211_mmie_16 *mmie;\n \tstruct ieee80211_hdr *hdr;\n@@ -378,7 +379,7 @@\n \n \tif (WARN_ON(skb_queue_len(&tx->skbs) != 1))\n \t\treturn TX_DROP;\n-@@ -1168,7 +1169,7 @@ ieee80211_crypto_aes_gmac_decrypt(struct\n+@@ -1169,7 +1170,7 @@ ieee80211_crypto_aes_gmac_decrypt(struct\n \tstruct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);\n \tstruct ieee80211_key *key = rx->key;\n \tstruct ieee80211_mmie_16 *mmie;\ndiff --git a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch\nindex ff619129d9..005e3e5d5d 100644\n--- a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch\n+++ b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch\n@@ -2,7 +2,7 @@ Used for AP+STA support in OpenWrt - preserve AP mode keys across STA reconnects\n \n --- a/net/mac80211/cfg.c\n +++ b/net/mac80211/cfg.c\n-@@ -1014,7 +1014,6 @@ static int ieee80211_stop_ap(struct wiph\n+@@ -1056,7 +1056,6 @@ static int ieee80211_stop_ap(struct wiph\n \tsdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;\n \n \t__sta_info_flush(sdata, true);\ndiff --git a/package/kernel/mac80211/patches/130-mac80211-hwsim-hrtimer-clock.patch b/package/kernel/mac80211/patches/130-mac80211-hwsim-hrtimer-clock.patch\ndeleted file mode 100644\nindex 828ed83cb7..0000000000\n--- a/package/kernel/mac80211/patches/130-mac80211-hwsim-hrtimer-clock.patch\n+++ /dev/null\n@@ -1,11 +0,0 @@\n---- a/drivers/net/wireless/mac80211_hwsim.c\n-+++ b/drivers/net/wireless/mac80211_hwsim.c\n-@@ -2678,7 +2678,7 @@ static int mac80211_hwsim_new_radio(stru\n- \n- \ttasklet_hrtimer_init(&data->beacon_timer,\n- \t\t\t mac80211_hwsim_beacon,\n--\t\t\t CLOCK_MONOTONIC_RAW, HRTIMER_MODE_ABS);\n-+\t\t\t CLOCK_MONOTONIC, HRTIMER_MODE_ABS);\n- \n- \tspin_lock_bh(&hwsim_radio_lock);\n- \tlist_add_tail(&data->list, &hwsim_radios);\ndiff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch\nindex ca1e53f8df..42a692a1fc 100644\n--- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch\n+++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch\n@@ -1,6 +1,6 @@\n --- a/net/mac80211/main.c\n +++ b/net/mac80211/main.c\n-@@ -291,7 +291,7 @@ void ieee80211_restart_hw(struct ieee802\n+@@ -292,7 +292,7 @@ void ieee80211_restart_hw(struct ieee802\n }\n EXPORT_SYMBOL(ieee80211_restart_hw);\n \n@@ -9,7 +9,7 @@\n static int ieee80211_ifa_changed(struct notifier_block *nb,\n \t\t\t\t unsigned long data, void *arg)\n {\n-@@ -350,7 +350,7 @@ static int ieee80211_ifa_changed(struct\n+@@ -351,7 +351,7 @@ static int ieee80211_ifa_changed(struct\n }\n #endif\n \n@@ -18,7 +18,7 @@\n static int ieee80211_ifa6_changed(struct notifier_block *nb,\n \t\t\t\t unsigned long data, void *arg)\n {\n-@@ -1111,14 +1111,14 @@ int ieee80211_register_hw(struct ieee802\n+@@ -1115,14 +1115,14 @@ int ieee80211_register_hw(struct ieee802\n \tif (result)\n \t\tgoto fail_flows;\n \n@@ -35,7 +35,7 @@\n \tlocal->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;\n \tresult = register_inet6addr_notifier(&local->ifa6_notifier);\n \tif (result)\n-@@ -1127,13 +1127,13 @@ int ieee80211_register_hw(struct ieee802\n+@@ -1131,13 +1131,13 @@ int ieee80211_register_hw(struct ieee802\n \n \treturn 0;\n \n@@ -52,7 +52,7 @@\n fail_ifa:\n #endif\n \tieee80211_txq_teardown_flows(local);\n-@@ -1163,10 +1163,10 @@ void ieee80211_unregister_hw(struct ieee\n+@@ -1167,10 +1167,10 @@ void ieee80211_unregister_hw(struct ieee\n \ttasklet_kill(&local->tx_pending_tasklet);\n \ttasklet_kill(&local->tasklet);\n \ndiff --git a/package/kernel/mac80211/patches/210-ap_scan.patch b/package/kernel/mac80211/patches/210-ap_scan.patch\nindex 3b613bba0e..e9999e32b9 100644\n--- a/package/kernel/mac80211/patches/210-ap_scan.patch\n+++ b/package/kernel/mac80211/patches/210-ap_scan.patch\n@@ -1,6 +1,6 @@\n --- a/net/mac80211/cfg.c\n +++ b/net/mac80211/cfg.c\n-@@ -2165,7 +2165,7 @@ static int ieee80211_scan(struct wiphy *\n+@@ -2212,7 +2212,7 @@ static int ieee80211_scan(struct wiphy *\n \t\t * the frames sent while scanning on other channel will be\n \t\t * lost)\n \t\t */\ndiff --git a/package/kernel/mac80211/patches/304-ath9k-force-rx_clear-when-disabling-rx.patch b/package/kernel/mac80211/patches/304-ath9k-force-rx_clear-when-disabling-rx.patch\nindex eb6862db6d..8aaccf49b4 100644\n--- a/package/kernel/mac80211/patches/304-ath9k-force-rx_clear-when-disabling-rx.patch\n+++ b/package/kernel/mac80211/patches/304-ath9k-force-rx_clear-when-disabling-rx.patch\n@@ -12,7 +12,7 @@ Signed-off-by: Helmut Schaa \n \n --- a/drivers/net/wireless/ath/ath9k/mac.c\n +++ b/drivers/net/wireless/ath/ath9k/mac.c\n-@@ -677,13 +677,18 @@ void ath9k_hw_startpcureceive(struct ath\n+@@ -678,13 +678,18 @@ void ath9k_hw_startpcureceive(struct ath\n \n \tath9k_ani_reset(ah, is_scanning);\n \ndiff --git a/package/kernel/mac80211/patches/305-ath9k-limit-retries-for-powersave-response-frames.patch b/package/kernel/mac80211/patches/305-ath9k-limit-retries-for-powersave-response-frames.patch\nindex 5923594be3..31825b819c 100644\n--- a/package/kernel/mac80211/patches/305-ath9k-limit-retries-for-powersave-response-frames.patch\n+++ b/package/kernel/mac80211/patches/305-ath9k-limit-retries-for-powersave-response-frames.patch\n@@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau \n }\n \n static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,\n-@@ -1522,7 +1537,7 @@ ath_tx_form_burst(struct ath_softc *sc,\n+@@ -1502,7 +1517,7 @@ ath_tx_form_burst(struct ath_softc *sc,\n \t\t\tbreak;\n \t\t}\n \n@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau \n \t} while (1);\n }\n \n-@@ -1552,7 +1567,7 @@ static bool ath_tx_sched_aggr(struct ath\n+@@ -1532,7 +1547,7 @@ static bool ath_tx_sched_aggr(struct ath\n \t\treturn false;\n \t}\n \n@@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau \n \tif (aggr)\n \t\taggr_len = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf);\n \telse\n-@@ -1710,7 +1725,7 @@ void ath9k_release_buffered_frames(struc\n+@@ -1690,7 +1705,7 @@ void ath9k_release_buffered_frames(struc\n \t\t\t\tbreak;\n \n \t\t\tlist_add_tail(&bf->list, &bf_q);\n@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau \n \t\t\tif (bf_isampdu(bf)) {\n \t\t\t\tath_tx_addto_baw(sc, tid, bf);\n \t\t\t\tbf->bf_state.bf_type &= ~BUF_AGGR;\n-@@ -2410,7 +2425,7 @@ int ath_tx_start(struct ieee80211_hw *hw\n+@@ -2390,7 +2405,7 @@ int ath_tx_start(struct ieee80211_hw *hw\n \tif (txctl->paprd)\n \t\tbf->bf_state.bfs_paprd_timestamp = jiffies;\n \n@@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau \n \tath_tx_send_normal(sc, txq, tid, skb);\n \n out:\n-@@ -2449,7 +2464,7 @@ void ath_tx_cabq(struct ieee80211_hw *hw\n+@@ -2429,7 +2444,7 @@ void ath_tx_cabq(struct ieee80211_hw *hw\n \t\t\tbreak;\n \n \t\tbf->bf_lastbf = bf;\n@@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau \n \t\tath_buf_set_rate(sc, bf, &info, fi->framelen, false);\n \t\tduration += info.rates[0].PktDuration;\n \t\tif (bf_tail)\n-@@ -2968,7 +2983,7 @@ int ath9k_tx99_send(struct ath_softc *sc\n+@@ -2946,7 +2961,7 @@ int ath9k_tx99_send(struct ath_softc *sc\n \t\treturn -EINVAL;\n \t}\n \ndiff --git a/package/kernel/mac80211/patches/306-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch b/package/kernel/mac80211/patches/306-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch\nindex 956ab83903..35d07430eb 100644\n--- a/package/kernel/mac80211/patches/306-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch\n+++ b/package/kernel/mac80211/patches/306-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch\n@@ -8,7 +8,7 @@ This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.\n \n --- a/drivers/net/wireless/ath/ath9k/hw.c\n +++ b/drivers/net/wireless/ath/ath9k/hw.c\n-@@ -2931,7 +2931,8 @@ void ath9k_hw_apply_txpower(struct ath_h\n+@@ -2935,7 +2935,8 @@ void ath9k_hw_apply_txpower(struct ath_h\n {\n \tstruct ath_regulatory *reg = ath9k_hw_regulatory(ah);\n \tstruct ieee80211_channel *channel;\n@@ -18,7 +18,7 @@ This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.\n \n \tif (!chan)\n \t\treturn;\n-@@ -2939,10 +2940,15 @@ void ath9k_hw_apply_txpower(struct ath_h\n+@@ -2943,10 +2944,15 @@ void ath9k_hw_apply_txpower(struct ath_h\n \tchannel = chan->chan;\n \tchan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);\n \tnew_pwr = min_t(int, chan_pwr, reg->power_limit);\ndiff --git a/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch\nindex 1a6fd8471c..367ceced34 100644\n--- a/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch\n+++ b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch\n@@ -21,7 +21,7 @@ Signed-off-by: Janusz Dziedzic \n \n --- a/net/mac80211/tx.c\n +++ b/net/mac80211/tx.c\n-@@ -925,7 +925,7 @@ ieee80211_tx_h_fragment(struct ieee80211\n+@@ -921,7 +921,7 @@ ieee80211_tx_h_fragment(struct ieee80211\n \tstruct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);\n \tstruct ieee80211_hdr *hdr = (void *)skb->data;\n \tint frag_threshold = tx->local->hw.wiphy->frag_threshold;\n@@ -30,7 +30,7 @@ Signed-off-by: Janusz Dziedzic \n \tint fragnum;\n \n \t/* no matter what happens, tx->skb moves to tx->skbs */\n-@@ -946,8 +946,6 @@ ieee80211_tx_h_fragment(struct ieee80211\n+@@ -942,8 +942,6 @@ ieee80211_tx_h_fragment(struct ieee80211\n \tif (WARN_ON(info->flags & IEEE80211_TX_CTL_AMPDU))\n \t\treturn TX_DROP;\n \n@@ -39,7 +39,7 @@ Signed-off-by: Janusz Dziedzic \n \t/* internal error, why isn't DONTFRAG set? */\n \tif (WARN_ON(skb->len + FCS_LEN <= frag_threshold))\n \t\treturn TX_DROP;\n-@@ -1179,6 +1177,8 @@ ieee80211_tx_prepare(struct ieee80211_su\n+@@ -1175,6 +1173,8 @@ ieee80211_tx_prepare(struct ieee80211_su\n \n \thdr = (struct ieee80211_hdr *) skb->data;\n \n@@ -48,7 +48,7 @@ Signed-off-by: Janusz Dziedzic \n \tif (likely(sta)) {\n \t\tif (!IS_ERR(sta))\n \t\t\ttx->sta = sta;\n-@@ -3437,6 +3437,7 @@ begin:\n+@@ -3440,6 +3440,7 @@ begin:\n \ttx.local = local;\n \ttx.skb = skb;\n \ttx.sdata = vif_to_sdata(info->control.vif);\n@@ -56,7 +56,7 @@ Signed-off-by: Janusz Dziedzic \n \n \tif (txq->sta)\n \t\ttx.sta = container_of(txq->sta, struct sta_info, sta);\n-@@ -3731,6 +3732,7 @@ ieee80211_build_data_template(struct iee\n+@@ -3734,6 +3735,7 @@ ieee80211_build_data_template(struct iee\n \thdr = (void *)skb->data;\n \ttx.sta = sta_info_get(sdata, hdr->addr1);\n \ttx.skb = skb;\n@@ -66,7 +66,7 @@ Signed-off-by: Janusz Dziedzic \n \t\trcu_read_unlock();\n --- a/net/mac80211/util.c\n +++ b/net/mac80211/util.c\n-@@ -1227,6 +1227,7 @@ void ieee80211_send_auth(struct ieee8021\n+@@ -1232,6 +1232,7 @@ void ieee80211_send_auth(struct ieee8021\n \tstruct ieee80211_local *local = sdata->local;\n \tstruct sk_buff *skb;\n \tstruct ieee80211_mgmt *mgmt;\n@@ -74,8 +74,8 @@ Signed-off-by: Janusz Dziedzic \n \tint err;\n \n \t/* 24 + 6 = header + auth_algo + auth_transaction + status_code */\n-@@ -1251,8 +1252,10 @@ void ieee80211_send_auth(struct ieee8021\n- \t\tmemcpy(skb_put(skb, extra_len), extra, extra_len);\n+@@ -1255,8 +1256,10 @@ void ieee80211_send_auth(struct ieee8021\n+ \t\tskb_put_data(skb, extra, extra_len);\n \n \tif (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {\n +\t\thdrlen = ieee80211_hdrlen(mgmt->frame_control);\n@@ -155,7 +155,7 @@ Signed-off-by: Janusz Dziedzic \n \t\t\t size_t klen, u8 *data, size_t data_len);\n --- a/net/mac80211/wpa.c\n +++ b/net/mac80211/wpa.c\n-@@ -43,7 +43,7 @@ ieee80211_tx_h_michael_mic_add(struct ie\n+@@ -44,7 +44,7 @@ ieee80211_tx_h_michael_mic_add(struct ie\n \t skb->len < 24 || !ieee80211_is_data_present(hdr->frame_control))\n \t\treturn TX_CONTINUE;\n \n@@ -164,7 +164,7 @@ Signed-off-by: Janusz Dziedzic \n \tif (skb->len < hdrlen)\n \t\treturn TX_DROP;\n \n-@@ -186,7 +186,6 @@ mic_fail_no_key:\n+@@ -187,7 +187,6 @@ mic_fail_no_key:\n \n static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)\n {\n@@ -172,7 +172,7 @@ Signed-off-by: Janusz Dziedzic \n \tstruct ieee80211_key *key = tx->key;\n \tstruct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);\n \tunsigned int hdrlen;\n-@@ -201,7 +200,7 @@ static int tkip_encrypt_skb(struct ieee8\n+@@ -202,7 +201,7 @@ static int tkip_encrypt_skb(struct ieee8\n \t\treturn 0;\n \t}\n \n@@ -181,7 +181,7 @@ Signed-off-by: Janusz Dziedzic \n \tlen = skb->len - hdrlen;\n \n \tif (info->control.hw_key)\n-@@ -419,7 +418,7 @@ static int ccmp_encrypt_skb(struct ieee8\n+@@ -420,7 +419,7 @@ static int ccmp_encrypt_skb(struct ieee8\n \t\treturn 0;\n \t}\n \n@@ -190,7 +190,7 @@ Signed-off-by: Janusz Dziedzic \n \tlen = skb->len - hdrlen;\n \n \tif (info->control.hw_key)\n-@@ -652,7 +651,7 @@ static int gcmp_encrypt_skb(struct ieee8\n+@@ -653,7 +652,7 @@ static int gcmp_encrypt_skb(struct ieee8\n \t\treturn 0;\n \t}\n \n@@ -199,7 +199,7 @@ Signed-off-by: Janusz Dziedzic \n \tlen = skb->len - hdrlen;\n \n \tif (info->control.hw_key)\n-@@ -792,7 +791,6 @@ static ieee80211_tx_result\n+@@ -793,7 +792,6 @@ static ieee80211_tx_result\n ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,\n \t\t\t struct sk_buff *skb)\n {\n@@ -207,7 +207,7 @@ Signed-off-by: Janusz Dziedzic \n \tstruct ieee80211_key *key = tx->key;\n \tstruct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);\n \tint hdrlen;\n-@@ -808,8 +806,7 @@ ieee80211_crypto_cs_encrypt(struct ieee8\n+@@ -809,8 +807,7 @@ ieee80211_crypto_cs_encrypt(struct ieee8\n \t\t pskb_expand_head(skb, iv_len, 0, GFP_ATOMIC)))\n \t\treturn TX_DROP;\n \ndiff --git a/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch b/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch\nindex 43455773f1..b3e6c619c8 100644\n--- a/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch\n+++ b/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch\n@@ -23,7 +23,7 @@ Signed-off-by: Janusz Dziedzic \n \n --- a/include/net/mac80211.h\n +++ b/include/net/mac80211.h\n-@@ -2043,6 +2043,9 @@ struct ieee80211_txq {\n+@@ -2067,6 +2067,9 @@ struct ieee80211_txq {\n *\tThe stack will not do fragmentation.\n *\tThe callback for @set_frag_threshold should be set as well.\n *\n@@ -33,7 +33,7 @@ Signed-off-by: Janusz Dziedzic \n * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays\n */\n enum ieee80211_hw_flags {\n-@@ -2085,6 +2088,7 @@ enum ieee80211_hw_flags {\n+@@ -2109,6 +2112,7 @@ enum ieee80211_hw_flags {\n \tIEEE80211_HW_TX_FRAG_LIST,\n \tIEEE80211_HW_REPORTS_LOW_ACK,\n \tIEEE80211_HW_SUPPORTS_TX_FRAG,\n@@ -53,7 +53,7 @@ Signed-off-by: Janusz Dziedzic \n \n --- a/net/mac80211/ieee80211_i.h\n +++ b/net/mac80211/ieee80211_i.h\n-@@ -1553,6 +1553,29 @@ ieee80211_vif_get_num_mcast_if(struct ie\n+@@ -1547,6 +1547,29 @@ ieee80211_vif_get_num_mcast_if(struct ie\n \treturn -1;\n }\n \n@@ -85,7 +85,7 @@ Signed-off-by: Janusz Dziedzic \n \t\t\t\t unsigned int mpdu_len,\n --- a/net/mac80211/sta_info.h\n +++ b/net/mac80211/sta_info.h\n-@@ -282,7 +282,7 @@ struct ieee80211_fast_tx {\n+@@ -290,7 +290,7 @@ struct ieee80211_fast_tx {\n \tu8 hdr_len;\n \tu8 sa_offs, da_offs, pn_offs;\n \tu8 band;\n@@ -96,7 +96,7 @@ Signed-off-by: Janusz Dziedzic \n \tstruct rcu_head rcu_head;\n --- a/net/mac80211/status.c\n +++ b/net/mac80211/status.c\n-@@ -693,9 +693,22 @@ void ieee80211_tx_monitor(struct ieee802\n+@@ -642,9 +642,22 @@ void ieee80211_tx_monitor(struct ieee802\n \tstruct sk_buff *skb2;\n \tstruct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);\n \tstruct ieee80211_sub_if_data *sdata;\n@@ -137,7 +137,7 @@ Signed-off-by: Janusz Dziedzic \n \n --- a/net/mac80211/tx.c\n +++ b/net/mac80211/tx.c\n-@@ -1176,8 +1176,7 @@ ieee80211_tx_prepare(struct ieee80211_su\n+@@ -1172,8 +1172,7 @@ ieee80211_tx_prepare(struct ieee80211_su\n \tinfo->flags &= ~IEEE80211_TX_INTFL_NEED_TXPROCESSING;\n \n \thdr = (struct ieee80211_hdr *) skb->data;\n@@ -147,7 +147,7 @@ Signed-off-by: Janusz Dziedzic \n \n \tif (likely(sta)) {\n \t\tif (!IS_ERR(sta))\n-@@ -2152,7 +2151,7 @@ netdev_tx_t ieee80211_monitor_start_xmit\n+@@ -2155,7 +2154,7 @@ netdev_tx_t ieee80211_monitor_start_xmit\n \t\tgoto fail;\n \n \thdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);\n@@ -156,7 +156,7 @@ Signed-off-by: Janusz Dziedzic \n \n \tif (skb->len < len_rthdr + hdrlen)\n \t\tgoto fail;\n-@@ -2370,7 +2369,7 @@ static struct sk_buff *ieee80211_build_h\n+@@ -2373,7 +2372,7 @@ static struct sk_buff *ieee80211_build_h\n \tstruct ieee80211_chanctx_conf *chanctx_conf;\n \tstruct ieee80211_sub_if_data *ap_sdata;\n \tenum nl80211_band band;\n@@ -165,7 +165,7 @@ Signed-off-by: Janusz Dziedzic \n \n \tif (IS_ERR(sta))\n \t\tsta = NULL;\n-@@ -2590,6 +2589,9 @@ static struct sk_buff *ieee80211_build_h\n+@@ -2593,6 +2592,9 @@ static struct sk_buff *ieee80211_build_h\n \t\thdrlen += 2;\n \t}\n \n@@ -175,7 +175,7 @@ Signed-off-by: Janusz Dziedzic \n \t/*\n \t * Drop unicast frames to unauthorised stations unless they are\n \t * EAPOL frames from the local station.\n-@@ -2670,6 +2672,7 @@ static struct sk_buff *ieee80211_build_h\n+@@ -2673,6 +2675,7 @@ static struct sk_buff *ieee80211_build_h\n \n \tskb_pull(skb, skip_header_bytes);\n \thead_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);\n@@ -183,7 +183,7 @@ Signed-off-by: Janusz Dziedzic \n \n \t/*\n \t * So we need to modify the skb header and hence need a copy of\n-@@ -2702,6 +2705,9 @@ static struct sk_buff *ieee80211_build_h\n+@@ -2705,6 +2708,9 @@ static struct sk_buff *ieee80211_build_h\n \t\tmemcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);\n #endif\n \n@@ -193,7 +193,7 @@ Signed-off-by: Janusz Dziedzic \n \tif (ieee80211_is_data_qos(fc)) {\n \t\t__le16 *qos_control;\n \n-@@ -2877,6 +2883,9 @@ void ieee80211_check_fast_xmit(struct st\n+@@ -2880,6 +2886,9 @@ void ieee80211_check_fast_xmit(struct st\n \t\tfc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);\n \t}\n \n@@ -203,7 +203,7 @@ Signed-off-by: Janusz Dziedzic \n \t/* We store the key here so there's no point in using rcu_dereference()\n \t * but that's fine because the code that changes the pointers will call\n \t * this function after doing so. For a single CPU that would be enough,\n-@@ -3464,7 +3473,7 @@ begin:\n+@@ -3467,7 +3476,7 @@ begin:\n \n \t\tif (tx.key &&\n \t\t (tx.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV))\n@@ -214,7 +214,7 @@ Signed-off-by: Janusz Dziedzic \n \t\t\t\t\t tx.key, skb);\n --- a/net/mac80211/util.c\n +++ b/net/mac80211/util.c\n-@@ -1225,6 +1225,7 @@ void ieee80211_send_auth(struct ieee8021\n+@@ -1230,6 +1230,7 @@ void ieee80211_send_auth(struct ieee8021\n \t\t\t u32 tx_flags)\n {\n \tstruct ieee80211_local *local = sdata->local;\n@@ -222,8 +222,8 @@ Signed-off-by: Janusz Dziedzic \n \tstruct sk_buff *skb;\n \tstruct ieee80211_mgmt *mgmt;\n \tunsigned int hdrlen;\n-@@ -1252,7 +1253,7 @@ void ieee80211_send_auth(struct ieee8021\n- \t\tmemcpy(skb_put(skb, extra_len), extra, extra_len);\n+@@ -1256,7 +1257,7 @@ void ieee80211_send_auth(struct ieee8021\n+ \t\tskb_put_data(skb, extra, extra_len);\n \n \tif (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {\n -\t\thdrlen = ieee80211_hdrlen(mgmt->frame_control);\ndiff --git a/package/kernel/mac80211/patches/309-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch b/package/kernel/mac80211/patches/309-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch\nindex a62b1bb28e..609b15b832 100644\n--- a/package/kernel/mac80211/patches/309-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch\n+++ b/package/kernel/mac80211/patches/309-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Chaitanya TK \n \n --- a/include/linux/ieee80211.h\n +++ b/include/linux/ieee80211.h\n-@@ -1553,6 +1553,7 @@ struct ieee80211_vht_operation {\n+@@ -1556,6 +1556,7 @@ struct ieee80211_vht_operation {\n #define IEEE80211_VHT_CAP_RXSTBC_3\t\t\t\t0x00000300\n #define IEEE80211_VHT_CAP_RXSTBC_4\t\t\t\t0x00000400\n #define IEEE80211_VHT_CAP_RXSTBC_MASK\t\t\t\t0x00000700\ndiff --git a/package/kernel/mac80211/patches/310-ath9k-fix-moredata-bit-in-PS-buffered-frame-release.patch b/package/kernel/mac80211/patches/310-ath9k-fix-moredata-bit-in-PS-buffered-frame-release.patch\nindex b2a74ccbac..c9c74bb836 100644\n--- a/package/kernel/mac80211/patches/310-ath9k-fix-moredata-bit-in-PS-buffered-frame-release.patch\n+++ b/package/kernel/mac80211/patches/310-ath9k-fix-moredata-bit-in-PS-buffered-frame-release.patch\n@@ -7,7 +7,7 @@ Signed-off-by: Felix Fietkau \n \n --- a/drivers/net/wireless/ath/ath9k/xmit.c\n +++ b/drivers/net/wireless/ath/ath9k/xmit.c\n-@@ -1694,6 +1694,22 @@ void ath_tx_aggr_wakeup(struct ath_softc\n+@@ -1674,6 +1674,22 @@ void ath_tx_aggr_wakeup(struct ath_softc\n \t}\n }\n \n@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau \n void ath9k_release_buffered_frames(struct ieee80211_hw *hw,\n \t\t\t\t struct ieee80211_sta *sta,\n \t\t\t\t u16 tids, int nframes,\n-@@ -1724,6 +1740,7 @@ void ath9k_release_buffered_frames(struc\n+@@ -1704,6 +1720,7 @@ void ath9k_release_buffered_frames(struc\n \t\t\tif (!bf)\n \t\t\t\tbreak;\n \n@@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau \n \t\t\tlist_add_tail(&bf->list, &bf_q);\n \t\t\tath_set_rates(tid->an->vif, tid->an->sta, bf, true);\n \t\t\tif (bf_isampdu(bf)) {\n-@@ -1747,6 +1764,9 @@ void ath9k_release_buffered_frames(struc\n+@@ -1727,6 +1744,9 @@ void ath9k_release_buffered_frames(struc\n \tif (list_empty(&bf_q))\n \t\treturn;\n \ndiff --git a/package/kernel/mac80211/patches/311-ath9k-clear-potentially-stale-EOSP-status-bit-in-int.patch b/package/kernel/mac80211/patches/311-ath9k-clear-potentially-stale-EOSP-status-bit-in-int.patch\nindex 9863dffc90..1893187e8a 100644\n--- a/package/kernel/mac80211/patches/311-ath9k-clear-potentially-stale-EOSP-status-bit-in-int.patch\n+++ b/package/kernel/mac80211/patches/311-ath9k-clear-potentially-stale-EOSP-status-bit-in-int.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau \n \n --- a/drivers/net/wireless/ath/ath9k/xmit.c\n +++ b/drivers/net/wireless/ath/ath9k/xmit.c\n-@@ -1004,7 +1004,8 @@ ath_tx_get_tid_subframe(struct ath_softc\n+@@ -984,7 +984,8 @@ ath_tx_get_tid_subframe(struct ath_softc\n \t\tbf->bf_lastbf = bf;\n \n \t\ttx_info = IEEE80211_SKB_CB(skb);\ndiff --git a/package/kernel/mac80211/patches/313-ath9k-fix-block-ack-window-tracking-issues.patch b/package/kernel/mac80211/patches/313-ath9k-fix-block-ack-window-tracking-issues.patch\nindex fb8df08afe..59de1dfe1a 100644\n--- a/package/kernel/mac80211/patches/313-ath9k-fix-block-ack-window-tracking-issues.patch\n+++ b/package/kernel/mac80211/patches/313-ath9k-fix-block-ack-window-tracking-issues.patch\n@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau \n \n \t\t\t\t\tath_tx_complete_buf(sc, bf, txq,\n \t\t\t\t\t\t\t &bf_head, NULL, ts,\n-@@ -1046,11 +1054,14 @@ ath_tx_get_tid_subframe(struct ath_softc\n+@@ -1026,11 +1034,14 @@ ath_tx_get_tid_subframe(struct ath_softc\n \n \t\t\tINIT_LIST_HEAD(&bf_head);\n \t\t\tlist_add(&bf->list, &bf_head);\n@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau \n \t\treturn bf;\n \t}\n \n-@@ -1108,8 +1119,6 @@ ath_tx_form_aggr(struct ath_softc *sc, s\n+@@ -1088,8 +1099,6 @@ ath_tx_form_aggr(struct ath_softc *sc, s\n \t\tbf->bf_next = NULL;\n \n \t\t/* link buffers of this frame to the aggregate */\n@@ -100,7 +100,7 @@ Signed-off-by: Felix Fietkau \n \t\tbf->bf_state.ndelim = ndelim;\n \n \t\tlist_add_tail(&bf->list, bf_q);\n-@@ -1745,10 +1754,8 @@ void ath9k_release_buffered_frames(struc\n+@@ -1725,10 +1734,8 @@ void ath9k_release_buffered_frames(struc\n \t\t\tath9k_set_moredata(sc, bf, true);\n \t\t\tlist_add_tail(&bf->list, &bf_q);\n \t\t\tath_set_rates(tid->an->vif, tid->an->sta, bf, true);\ndiff --git a/package/kernel/mac80211/patches/314-ath9k-rename-tx_complete_work-to-hw_check_work.patch b/package/kernel/mac80211/patches/314-ath9k-rename-tx_complete_work-to-hw_check_work.patch\ndeleted file mode 100644\nindex 5465df3ccf..0000000000\n--- a/package/kernel/mac80211/patches/314-ath9k-rename-tx_complete_work-to-hw_check_work.patch\n+++ /dev/null\n@@ -1,175 +0,0 @@\n-From: Felix Fietkau \n-Date: Wed, 25 Jan 2017 12:57:05 +0100\n-Subject: [PATCH] ath9k: rename tx_complete_work to hw_check_work\n-\n-Also include common MAC alive check. This should make the hang checks\n-more reliable for modes where beacons are not sent and is used as a\n-starting point for further hang check improvements\n-\n-Signed-off-by: Felix Fietkau \n----\n-\n---- a/drivers/net/wireless/ath/ath9k/ath9k.h\n-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h\n-@@ -108,7 +108,7 @@ int ath_descdma_setup(struct ath_softc *\n- #define ATH_AGGR_MIN_QDEPTH 2\n- /* minimum h/w qdepth for non-aggregated traffic */\n- #define ATH_NON_AGGR_MIN_QDEPTH 8\n--#define ATH_TX_COMPLETE_POLL_INT 1000\n-+#define ATH_HW_CHECK_POLL_INT 1000\n- #define ATH_TXFIFO_DEPTH 8\n- #define ATH_TX_ERROR 0x01\n- \n-@@ -745,7 +745,7 @@ void ath9k_csa_update(struct ath_softc *\n- #define ATH_PAPRD_TIMEOUT 100 /* msecs */\n- #define ATH_PLL_WORK_INTERVAL 100\n- \n--void ath_tx_complete_poll_work(struct work_struct *work);\n-+void ath_hw_check_work(struct work_struct *work);\n- void ath_reset_work(struct work_struct *work);\n- bool ath_hw_check(struct ath_softc *sc);\n- void ath_hw_pll_work(struct work_struct *work);\n-@@ -1053,7 +1053,7 @@ struct ath_softc {\n- #ifdef CPTCFG_ATH9K_DEBUGFS\n- \tstruct ath9k_debug debug;\n- #endif\n--\tstruct delayed_work tx_complete_work;\n-+\tstruct delayed_work hw_check_work;\n- \tstruct delayed_work hw_pll_work;\n- \tstruct timer_list sleep_timer;\n- \n---- a/drivers/net/wireless/ath/ath9k/init.c\n-+++ b/drivers/net/wireless/ath/ath9k/init.c\n-@@ -681,6 +681,7 @@ static int ath9k_init_softc(u16 devid, s\n- \tINIT_WORK(&sc->hw_reset_work, ath_reset_work);\n- \tINIT_WORK(&sc->paprd_work, ath_paprd_calibrate);\n- \tINIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);\n-+\tINIT_DELAYED_WORK(&sc->hw_check_work, ath_hw_check_work);\n- \n- \tath9k_init_channel_context(sc);\n- \n---- a/drivers/net/wireless/ath/ath9k/link.c\n-+++ b/drivers/net/wireless/ath/ath9k/link.c\n-@@ -20,20 +20,13 @@\n- * TX polling - checks if the TX engine is stuck somewhere\n- * and issues a chip reset if so.\n- */\n--void ath_tx_complete_poll_work(struct work_struct *work)\n-+static bool ath_tx_complete_check(struct ath_softc *sc)\n- {\n--\tstruct ath_softc *sc = container_of(work, struct ath_softc,\n--\t\t\t\t\t tx_complete_work.work);\n- \tstruct ath_txq *txq;\n- \tint i;\n--\tbool needreset = false;\n--\n- \n--\tif (sc->tx99_state) {\n--\t\tath_dbg(ath9k_hw_common(sc->sc_ah), RESET,\n--\t\t\t\"skip tx hung detection on tx99\\n\");\n--\t\treturn;\n--\t}\n-+\tif (sc->tx99_state)\n-+\t\treturn true;\n- \n- \tfor (i = 0; i < IEEE80211_NUM_ACS; i++) {\n- \t\ttxq = sc->tx.txq_map[i];\n-@@ -41,25 +34,36 @@ void ath_tx_complete_poll_work(struct wo\n- \t\tath_txq_lock(sc, txq);\n- \t\tif (txq->axq_depth) {\n- \t\t\tif (txq->axq_tx_inprogress) {\n--\t\t\t\tneedreset = true;\n- \t\t\t\tath_txq_unlock(sc, txq);\n--\t\t\t\tbreak;\n--\t\t\t} else {\n--\t\t\t\ttxq->axq_tx_inprogress = true;\n-+\t\t\t\tgoto reset;\n- \t\t\t}\n-+\n-+\t\t\ttxq->axq_tx_inprogress = true;\n- \t\t}\n- \t\tath_txq_unlock(sc, txq);\n- \t}\n- \n--\tif (needreset) {\n--\t\tath_dbg(ath9k_hw_common(sc->sc_ah), RESET,\n--\t\t\t\"tx hung, resetting the chip\\n\");\n--\t\tath9k_queue_reset(sc, RESET_TYPE_TX_HANG);\n-+\treturn true;\n-+\n-+reset:\n-+\tath_dbg(ath9k_hw_common(sc->sc_ah), RESET,\n-+\t\t\"tx hung, resetting the chip\\n\");\n-+\tath9k_queue_reset(sc, RESET_TYPE_TX_HANG);\n-+\treturn false;\n-+\n-+}\n-+\n-+void ath_hw_check_work(struct work_struct *work)\n-+{\n-+\tstruct ath_softc *sc = container_of(work, struct ath_softc,\n-+\t\t\t\t\t hw_check_work.work);\n-+\n-+\tif (!ath_hw_check(sc) ||\n-+\t !ath_tx_complete_check(sc))\n- \t\treturn;\n--\t}\n- \n--\tieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,\n--\t\t\t\t msecs_to_jiffies(ATH_TX_COMPLETE_POLL_INT));\n-+\tieee80211_queue_delayed_work(sc->hw, &sc->hw_check_work,\n-+\t\t\t\t msecs_to_jiffies(ATH_HW_CHECK_POLL_INT));\n- }\n- \n- /*\n---- a/drivers/net/wireless/ath/ath9k/main.c\n-+++ b/drivers/net/wireless/ath/ath9k/main.c\n-@@ -181,7 +181,7 @@ void ath9k_ps_restore(struct ath_softc *\n- static void __ath_cancel_work(struct ath_softc *sc)\n- {\n- \tcancel_work_sync(&sc->paprd_work);\n--\tcancel_delayed_work_sync(&sc->tx_complete_work);\n-+\tcancel_delayed_work_sync(&sc->hw_check_work);\n- \tcancel_delayed_work_sync(&sc->hw_pll_work);\n- \n- #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT\n-@@ -198,7 +198,8 @@ void ath_cancel_work(struct ath_softc *s\n- \n- void ath_restart_work(struct ath_softc *sc)\n- {\n--\tieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);\n-+\tieee80211_queue_delayed_work(sc->hw, &sc->hw_check_work,\n-+\t\t\t\t ATH_HW_CHECK_POLL_INT);\n- \n- \tif (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah))\n- \t\tieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,\n-@@ -2091,7 +2092,7 @@ void __ath9k_flush(struct ieee80211_hw *\n- \tint timeout;\n- \tbool drain_txq;\n- \n--\tcancel_delayed_work_sync(&sc->tx_complete_work);\n-+\tcancel_delayed_work_sync(&sc->hw_check_work);\n- \n- \tif (ah->ah_flags & AH_UNPLUGGED) {\n- \t\tath_dbg(common, ANY, \"Device has been unplugged!\\n\");\n-@@ -2129,7 +2130,8 @@ void __ath9k_flush(struct ieee80211_hw *\n- \t\tath9k_ps_restore(sc);\n- \t}\n- \n--\tieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);\n-+\tieee80211_queue_delayed_work(hw, &sc->hw_check_work,\n-+\t\t\t\t ATH_HW_CHECK_POLL_INT);\n- }\n- \n- static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw)\n---- a/drivers/net/wireless/ath/ath9k/xmit.c\n-+++ b/drivers/net/wireless/ath/ath9k/xmit.c\n-@@ -2916,8 +2916,6 @@ int ath_tx_init(struct ath_softc *sc, in\n- \t\treturn error;\n- \t}\n- \n--\tINIT_DELAYED_WORK(&sc->tx_complete_work, ath_tx_complete_poll_work);\n--\n- \tif (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)\n- \t\terror = ath_tx_edma_init(sc);\n- \ndiff --git a/package/kernel/mac80211/patches/315-ath9k_hw-check-if-the-chip-failed-to-wake-up.patch b/package/kernel/mac80211/patches/315-ath9k_hw-check-if-the-chip-failed-to-wake-up.patch\ndeleted file mode 100644\nindex b0cb74ad05..0000000000\n--- a/package/kernel/mac80211/patches/315-ath9k_hw-check-if-the-chip-failed-to-wake-up.patch\n+++ /dev/null\n@@ -1,30 +0,0 @@\n-From: Felix Fietkau \n-Date: Wed, 25 Jan 2017 12:58:17 +0100\n-Subject: [PATCH] ath9k_hw: check if the chip failed to wake up\n-\n-In an RFC patch, Sven Eckelmann and Simon Wunderlich reported:\n-\n-\"QCA 802.11n chips (especially AR9330/AR9340) sometimes end up in a\n-state in which a read of AR_CFG always returns 0xdeadbeef.\n-This should not happen when when the power_mode of the device is\n-ATH9K_PM_AWAKE.\"\n-\n-Include the check for the default register state in the existing MAC\n-hang check.\n-\n-Signed-off-by: Felix Fietkau \n----\n-\n---- a/drivers/net/wireless/ath/ath9k/hw.c\n-+++ b/drivers/net/wireless/ath/ath9k/hw.c\n-@@ -1624,6 +1624,10 @@ bool ath9k_hw_check_alive(struct ath_hw\n- \tint count = 50;\n- \tu32 reg, last_val;\n- \n-+\t/* Check if chip failed to wake up */\n-+\tif (REG_READ(ah, AR_CFG) == 0xdeadbeef)\n-+\t\treturn false;\n-+\n- \tif (AR_SREV_9300(ah))\n- \t\treturn !ath9k_hw_detect_mac_hang(ah);\n- \ndiff --git a/package/kernel/mac80211/patches/316-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch b/package/kernel/mac80211/patches/316-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch\ndeleted file mode 100644\nindex 7a41206132..0000000000\n--- a/package/kernel/mac80211/patches/316-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch\n+++ /dev/null\n@@ -1,197 +0,0 @@\n-From: Felix Fietkau \n-Date: Wed, 25 Jan 2017 15:10:37 +0100\n-Subject: [PATCH] ath9k: fix race condition in enabling/disabling IRQs\n-\n-The code currently relies on refcounting to disable IRQs from within the\n-IRQ handler and re-enabling them again after the tasklet has run.\n-\n-However, due to race conditions sometimes the IRQ handler might be\n-called twice, or the tasklet may not run at all (if interrupted in the\n-middle of a reset).\n-\n-This can cause nasty imbalances in the irq-disable refcount which will\n-get the driver permanently stuck until the entire radio has been stopped\n-and started again (ath_reset will not recover from this).\n-\n-Instead of using this fragile logic, change the code to ensure that\n-running the irq handler during tasklet processing is safe, and leave the\n-refcount untouched.\n-\n-Cc: stable@vger.kernel.org\n-Signed-off-by: Felix Fietkau \n----\n-\n---- a/drivers/net/wireless/ath/ath9k/ath9k.h\n-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h\n-@@ -998,6 +998,7 @@ struct ath_softc {\n- \tstruct survey_info *cur_survey;\n- \tstruct survey_info survey[ATH9K_NUM_CHANNELS];\n- \n-+\tspinlock_t intr_lock;\n- \tstruct tasklet_struct intr_tq;\n- \tstruct tasklet_struct bcon_tasklet;\n- \tstruct ath_hw *sc_ah;\n---- a/drivers/net/wireless/ath/ath9k/init.c\n-+++ b/drivers/net/wireless/ath/ath9k/init.c\n-@@ -669,6 +669,7 @@ static int ath9k_init_softc(u16 devid, s\n- \t\tcommon->bt_ant_diversity = 1;\n- \n- \tspin_lock_init(&common->cc_lock);\n-+\tspin_lock_init(&sc->intr_lock);\n- \tspin_lock_init(&sc->sc_serial_rw);\n- \tspin_lock_init(&sc->sc_pm_lock);\n- \tspin_lock_init(&sc->chan_lock);\n---- a/drivers/net/wireless/ath/ath9k/mac.c\n-+++ b/drivers/net/wireless/ath/ath9k/mac.c\n-@@ -810,21 +810,12 @@ void ath9k_hw_disable_interrupts(struct\n- }\n- EXPORT_SYMBOL(ath9k_hw_disable_interrupts);\n- \n--void ath9k_hw_enable_interrupts(struct ath_hw *ah)\n-+static void __ath9k_hw_enable_interrupts(struct ath_hw *ah)\n- {\n- \tstruct ath_common *common = ath9k_hw_common(ah);\n- \tu32 sync_default = AR_INTR_SYNC_DEFAULT;\n- \tu32 async_mask;\n- \n--\tif (!(ah->imask & ATH9K_INT_GLOBAL))\n--\t\treturn;\n--\n--\tif (!atomic_inc_and_test(&ah->intr_ref_cnt)) {\n--\t\tath_dbg(common, INTERRUPT, \"Do not enable IER ref count %d\\n\",\n--\t\t\tatomic_read(&ah->intr_ref_cnt));\n--\t\treturn;\n--\t}\n--\n- \tif (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah) ||\n- \t AR_SREV_9561(ah))\n- \t\tsync_default &= ~AR_INTR_SYNC_HOST1_FATAL;\n-@@ -846,6 +837,39 @@ void ath9k_hw_enable_interrupts(struct a\n- \tath_dbg(common, INTERRUPT, \"AR_IMR 0x%x IER 0x%x\\n\",\n- \t\tREG_READ(ah, AR_IMR), REG_READ(ah, AR_IER));\n- }\n-+\n-+void ath9k_hw_resume_interrupts(struct ath_hw *ah)\n-+{\n-+\tstruct ath_common *common = ath9k_hw_common(ah);\n-+\n-+\tif (!(ah->imask & ATH9K_INT_GLOBAL))\n-+\t\treturn;\n-+\n-+\tif (atomic_read(&ah->intr_ref_cnt) != 0) {\n-+\t\tath_dbg(common, INTERRUPT, \"Do not enable IER ref count %d\\n\",\n-+\t\t\tatomic_read(&ah->intr_ref_cnt));\n-+\t\treturn;\n-+\t}\n-+\n-+\t__ath9k_hw_enable_interrupts(ah);\n-+}\n-+EXPORT_SYMBOL(ath9k_hw_resume_interrupts);\n-+\n-+void ath9k_hw_enable_interrupts(struct ath_hw *ah)\n-+{\n-+\tstruct ath_common *common = ath9k_hw_common(ah);\n-+\n-+\tif (!(ah->imask & ATH9K_INT_GLOBAL))\n-+\t\treturn;\n-+\n-+\tif (!atomic_inc_and_test(&ah->intr_ref_cnt)) {\n-+\t\tath_dbg(common, INTERRUPT, \"Do not enable IER ref count %d\\n\",\n-+\t\t\tatomic_read(&ah->intr_ref_cnt));\n-+\t\treturn;\n-+\t}\n-+\n-+\t__ath9k_hw_enable_interrupts(ah);\n-+}\n- EXPORT_SYMBOL(ath9k_hw_enable_interrupts);\n- \n- void ath9k_hw_set_interrupts(struct ath_hw *ah)\n---- a/drivers/net/wireless/ath/ath9k/mac.h\n-+++ b/drivers/net/wireless/ath/ath9k/mac.h\n-@@ -744,6 +744,7 @@ void ath9k_hw_set_interrupts(struct ath_\n- void ath9k_hw_enable_interrupts(struct ath_hw *ah);\n- void ath9k_hw_disable_interrupts(struct ath_hw *ah);\n- void ath9k_hw_kill_interrupts(struct ath_hw *ah);\n-+void ath9k_hw_resume_interrupts(struct ath_hw *ah);\n- \n- void ar9002_hw_attach_mac_ops(struct ath_hw *ah);\n- \n---- a/drivers/net/wireless/ath/ath9k/main.c\n-+++ b/drivers/net/wireless/ath/ath9k/main.c\n-@@ -374,21 +374,20 @@ void ath9k_tasklet(unsigned long data)\n- \tstruct ath_common *common = ath9k_hw_common(ah);\n- \tenum ath_reset_type type;\n- \tunsigned long flags;\n--\tu32 status = sc->intrstatus;\n-+\tu32 status;\n- \tu32 rxmask;\n- \n-+\tspin_lock_irqsave(&sc->intr_lock, flags);\n-+\tstatus = sc->intrstatus;\n-+\tsc->intrstatus = 0;\n-+\tspin_unlock_irqrestore(&sc->intr_lock, flags);\n-+\n- \tath9k_ps_wakeup(sc);\n- \tspin_lock(&sc->sc_pcu_lock);\n- \n- \tif (status & ATH9K_INT_FATAL) {\n- \t\ttype = RESET_TYPE_FATAL_INT;\n- \t\tath9k_queue_reset(sc, type);\n--\n--\t\t/*\n--\t\t * Increment the ref. counter here so that\n--\t\t * interrupts are enabled in the reset routine.\n--\t\t */\n--\t\tatomic_inc(&ah->intr_ref_cnt);\n- \t\tath_dbg(common, RESET, \"FATAL: Skipping interrupts\\n\");\n- \t\tgoto out;\n- \t}\n-@@ -404,11 +403,6 @@ void ath9k_tasklet(unsigned long data)\n- \t\t\ttype = RESET_TYPE_BB_WATCHDOG;\n- \t\t\tath9k_queue_reset(sc, type);\n- \n--\t\t\t/*\n--\t\t\t * Increment the ref. counter here so that\n--\t\t\t * interrupts are enabled in the reset routine.\n--\t\t\t */\n--\t\t\tatomic_inc(&ah->intr_ref_cnt);\n- \t\t\tath_dbg(common, RESET,\n- \t\t\t\t\"BB_WATCHDOG: Skipping interrupts\\n\");\n- \t\t\tgoto out;\n-@@ -421,7 +415,6 @@ void ath9k_tasklet(unsigned long data)\n- \t\tif ((sc->gtt_cnt >= MAX_GTT_CNT) && !ath9k_hw_check_alive(ah)) {\n- \t\t\ttype = RESET_TYPE_TX_GTT;\n- \t\t\tath9k_queue_reset(sc, type);\n--\t\t\tatomic_inc(&ah->intr_ref_cnt);\n- \t\t\tath_dbg(common, RESET,\n- \t\t\t\t\"GTT: Skipping interrupts\\n\");\n- \t\t\tgoto out;\n-@@ -478,7 +471,7 @@ void ath9k_tasklet(unsigned long data)\n- \tath9k_btcoex_handle_interrupt(sc, status);\n- \n- \t/* re-enable hardware interrupt */\n--\tath9k_hw_enable_interrupts(ah);\n-+\tath9k_hw_resume_interrupts(ah);\n- out:\n- \tspin_unlock(&sc->sc_pcu_lock);\n- \tath9k_ps_restore(sc);\n-@@ -542,7 +535,9 @@ irqreturn_t ath_isr(int irq, void *dev)\n- \t\treturn IRQ_NONE;\n- \n- \t/* Cache the status */\n--\tsc->intrstatus = status;\n-+\tspin_lock(&sc->intr_lock);\n-+\tsc->intrstatus |= status;\n-+\tspin_unlock(&sc->intr_lock);\n- \n- \tif (status & SCHED_INTR)\n- \t\tsched = true;\n-@@ -588,7 +583,7 @@ chip_reset:\n- \n- \tif (sched) {\n- \t\t/* turn off every interrupt */\n--\t\tath9k_hw_disable_interrupts(ah);\n-+\t\tath9k_hw_kill_interrupts(ah);\n- \t\ttasklet_schedule(&sc->intr_tq);\n- \t}\n- \ndiff --git a/package/kernel/mac80211/patches/318-0001-brcmfmac-check-brcmf_bus_get_memdump-result-for-erro.patch b/package/kernel/mac80211/patches/318-0001-brcmfmac-check-brcmf_bus_get_memdump-result-for-erro.patch\ndeleted file mode 100644\nindex 4ae4c606c5..0000000000\n--- a/package/kernel/mac80211/patches/318-0001-brcmfmac-check-brcmf_bus_get_memdump-result-for-erro.patch\n+++ /dev/null\n@@ -1,52 +0,0 @@\n-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= \n-Date: Mon, 30 Jan 2017 16:09:51 +0100\n-Subject: [PATCH] brcmfmac: check brcmf_bus_get_memdump result for error\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-This method may be unsupported (see: USB bus) or may just fail (see:\n-SDIO bus).\n-While at it rework logic in brcmf_sdio_bus_get_memdump function to avoid\n-too many conditional code nesting levels.\n-\n-Signed-off-by: Rafał Miłecki \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c\n-@@ -32,16 +32,25 @@ static int brcmf_debug_create_memdump(st\n- {\n- \tvoid *dump;\n- \tsize_t ramsize;\n-+\tint err;\n- \n- \tramsize = brcmf_bus_get_ramsize(bus);\n--\tif (ramsize) {\n--\t\tdump = vzalloc(len + ramsize);\n--\t\tif (!dump)\n--\t\t\treturn -ENOMEM;\n--\t\tmemcpy(dump, data, len);\n--\t\tbrcmf_bus_get_memdump(bus, dump + len, ramsize);\n--\t\tdev_coredumpv(bus->dev, dump, len + ramsize, GFP_KERNEL);\n-+\tif (!ramsize)\n-+\t\treturn -ENOTSUPP;\n-+\n-+\tdump = vzalloc(len + ramsize);\n-+\tif (!dump)\n-+\t\treturn -ENOMEM;\n-+\n-+\tmemcpy(dump, data, len);\n-+\terr = brcmf_bus_get_memdump(bus, dump + len, ramsize);\n-+\tif (err) {\n-+\t\tvfree(dump);\n-+\t\treturn err;\n- \t}\n-+\n-+\tdev_coredumpv(bus->dev, dump, len + ramsize, GFP_KERNEL);\n-+\n- \treturn 0;\n- }\n- \ndiff --git a/package/kernel/mac80211/patches/319-0002-brcmfmac-be-more-verbose-when-PSM-s-watchdog-fires.patch b/package/kernel/mac80211/patches/319-0002-brcmfmac-be-more-verbose-when-PSM-s-watchdog-fires.patch\ndeleted file mode 100644\nindex 2a3b83864e..0000000000\n--- a/package/kernel/mac80211/patches/319-0002-brcmfmac-be-more-verbose-when-PSM-s-watchdog-fires.patch\n+++ /dev/null\n@@ -1,38 +0,0 @@\n-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= \n-Date: Mon, 30 Jan 2017 16:09:52 +0100\n-Subject: [PATCH] brcmfmac: be more verbose when PSM's watchdog fires\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-It's important to inform user so he knows things went wrong. He may also\n-want to get memory dump for further debugging purposes.\n-\n-Signed-off-by: Rafał Miłecki \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c\n-@@ -58,10 +58,18 @@ static int brcmf_debug_psm_watchdog_noti\n- \t\t\t\t\t const struct brcmf_event_msg *evtmsg,\n- \t\t\t\t\t void *data)\n- {\n-+\tint err;\n-+\n- \tbrcmf_dbg(TRACE, \"enter: bsscfgidx=%d\\n\", ifp->bsscfgidx);\n- \n--\treturn brcmf_debug_create_memdump(ifp->drvr->bus_if, data,\n--\t\t\t\t\t evtmsg->datalen);\n-+\tbrcmf_err(\"PSM's watchdog has fired!\\n\");\n-+\n-+\terr = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,\n-+\t\t\t\t\t evtmsg->datalen);\n-+\tif (err)\n-+\t\tbrcmf_err(\"Failed to get memory dump, %d\\n\", err);\n-+\n-+\treturn err;\n- }\n- \n- void brcmf_debugfs_init(void)\ndiff --git a/package/kernel/mac80211/patches/319-0003-brcmfmac-use-wiphy_read_of_freq_limits-to-respect-li.patch b/package/kernel/mac80211/patches/319-0003-brcmfmac-use-wiphy_read_of_freq_limits-to-respect-li.patch\ndeleted file mode 100644\nindex 6448bad5e9..0000000000\n--- a/package/kernel/mac80211/patches/319-0003-brcmfmac-use-wiphy_read_of_freq_limits-to-respect-li.patch\n+++ /dev/null\n@@ -1,44 +0,0 @@\n-From 0f83ff69735651cc7a3d150466a5257ff829b62b Mon Sep 17 00:00:00 2001\n-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= \n-Date: Tue, 17 Jan 2017 23:35:50 +0100\n-Subject: [PATCH] brcmfmac: use wiphy_read_of_freq_limits to respect limits\n- from DT\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-This new helper reads extra frequency limits specified in DT and\n-disables unavailable chanels. This is useful for devices (like home\n-routers) with chipsets limited e.g. by board design.\n-\n-In order to respect info read from DT we simply need to check for\n-IEEE80211_CHAN_DISABLED bit when constructing channel info.\n-\n-Signed-off-by: Rafał Miłecki \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++++\n- 1 file changed, 6 insertions(+)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-@@ -5908,6 +5908,9 @@ static int brcmf_construct_chaninfo(stru\n- \t\t\tcontinue;\n- \t\t}\n- \n-+\t\tif (channel->orig_flags & IEEE80211_CHAN_DISABLED)\n-+\t\t\tcontinue;\n-+\n- \t\t/* assuming the chanspecs order is HT20,\n- \t\t * HT40 upper, HT40 lower, and VHT80.\n- \t\t */\n-@@ -6509,6 +6512,9 @@ static int brcmf_setup_wiphy(struct wiph\n- \t\t\twiphy->bands[NL80211_BAND_5GHZ] = band;\n- \t\t}\n- \t}\n-+\n-+\twiphy_read_of_freq_limits(wiphy);\n-+\n- \treturn 0;\n- }\n- \ndiff --git a/package/kernel/mac80211/patches/319-0004-brcmfmac-merge-two-brcmf_err-macros-into-one.patch b/package/kernel/mac80211/patches/319-0004-brcmfmac-merge-two-brcmf_err-macros-into-one.patch\ndeleted file mode 100644\nindex defd5792ea..0000000000\n--- a/package/kernel/mac80211/patches/319-0004-brcmfmac-merge-two-brcmf_err-macros-into-one.patch\n+++ /dev/null\n@@ -1,43 +0,0 @@\n-From 9587a01a7ead9efc5032c16e0d9668de58be1186 Mon Sep 17 00:00:00 2001\n-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= \n-Date: Thu, 2 Feb 2017 22:33:13 +0100\n-Subject: [PATCH] brcmfmac: merge two brcmf_err macros into one\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-This allows simplifying the code by adding a simple IS_ENABLED check for\n-CONFIG_BRCMDB symbol.\n-\n-Signed-off-by: Rafał Miłecki \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 8 ++------\n- 1 file changed, 2 insertions(+), 6 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-@@ -45,20 +45,16 @@\n- #undef pr_fmt\n- #define pr_fmt(fmt)\t\tKBUILD_MODNAME \": \" fmt\n- \n-+#ifndef CPTCFG_BRCM_TRACING\n- /* Macro for error messages. net_ratelimit() is used when driver\n- * debugging is not selected. When debugging the driver error\n- * messages are as important as other tracing or even more so.\n- */\n--#ifndef CPTCFG_BRCM_TRACING\n--#ifdef CPTCFG_BRCMDBG\n--#define brcmf_err(fmt, ...)\tpr_err(\"%s: \" fmt, __func__, ##__VA_ARGS__)\n--#else\n- #define brcmf_err(fmt, ...)\t\t\t\t\t\t\\\n- \tdo {\t\t\t\t\t\t\t\t\\\n--\t\tif (net_ratelimit())\t\t\t\t\t\\\n-+\t\tif (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit())\t\\\n- \t\t\tpr_err(\"%s: \" fmt, __func__, ##__VA_ARGS__);\t\\\n- \t} while (0)\n--#endif\n- #else\n- __printf(2, 3)\n- void __brcmf_err(const char *func, const char *fmt, ...);\ndiff --git a/package/kernel/mac80211/patches/319-0005-brcmfmac-switch-to-C-function-__brcmf_err-for-printi.patch b/package/kernel/mac80211/patches/319-0005-brcmfmac-switch-to-C-function-__brcmf_err-for-printi.patch\ndeleted file mode 100644\nindex 5baf6960ec..0000000000\n--- a/package/kernel/mac80211/patches/319-0005-brcmfmac-switch-to-C-function-__brcmf_err-for-printi.patch\n+++ /dev/null\n@@ -1,69 +0,0 @@\n-From 087fa712a00685dac4bcc64b7c3dc8ae6bee8026 Mon Sep 17 00:00:00 2001\n-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= \n-Date: Thu, 2 Feb 2017 22:33:14 +0100\n-Subject: [PATCH] brcmfmac: switch to C function (__brcmf_err) for printing\n- errors\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-This will allow extending code and using more detailed messages e.g.\n-with the help of dev_err.\n-\n-Signed-off-by: Rafał Miłecki \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- .../net/wireless/broadcom/brcm80211/brcmfmac/common.c | 16 ++++++++++++++++\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 6 +++---\n- 2 files changed, 19 insertions(+), 3 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c\n-@@ -218,6 +218,22 @@ done:\n- \treturn err;\n- }\n- \n-+#ifndef CPTCFG_BRCM_TRACING\n-+void __brcmf_err(const char *func, const char *fmt, ...)\n-+{\n-+\tstruct va_format vaf;\n-+\tva_list args;\n-+\n-+\tva_start(args, fmt);\n-+\n-+\tvaf.fmt = fmt;\n-+\tvaf.va = &args;\n-+\tpr_err(\"%s: %pV\", func, &vaf);\n-+\n-+\tva_end(args);\n-+}\n-+#endif\n-+\n- #if defined(CPTCFG_BRCM_TRACING) || defined(CPTCFG_BRCMDBG)\n- void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)\n- {\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-@@ -45,6 +45,8 @@\n- #undef pr_fmt\n- #define pr_fmt(fmt)\t\tKBUILD_MODNAME \": \" fmt\n- \n-+__printf(2, 3)\n-+void __brcmf_err(const char *func, const char *fmt, ...);\n- #ifndef CPTCFG_BRCM_TRACING\n- /* Macro for error messages. net_ratelimit() is used when driver\n- * debugging is not selected. When debugging the driver error\n-@@ -53,11 +55,9 @@\n- #define brcmf_err(fmt, ...)\t\t\t\t\t\t\\\n- \tdo {\t\t\t\t\t\t\t\t\\\n- \t\tif (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit())\t\\\n--\t\t\tpr_err(\"%s: \" fmt, __func__, ##__VA_ARGS__);\t\\\n-+\t\t\t__brcmf_err(__func__, fmt, ##__VA_ARGS__);\t\\\n- \t} while (0)\n- #else\n--__printf(2, 3)\n--void __brcmf_err(const char *func, const char *fmt, ...);\n- #define brcmf_err(fmt, ...) \\\n- \t__brcmf_err(__func__, fmt, ##__VA_ARGS__)\n- #endif\ndiff --git a/package/kernel/mac80211/patches/319-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch b/package/kernel/mac80211/patches/319-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch\ndeleted file mode 100644\nindex 3aaddb800d..0000000000\n--- a/package/kernel/mac80211/patches/319-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch\n+++ /dev/null\n@@ -1,46 +0,0 @@\n-From d0630555650a394cf5743268820511f527a561a5 Mon Sep 17 00:00:00 2001\n-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= \n-Date: Thu, 2 Feb 2017 22:33:15 +0100\n-Subject: [PATCH] brcmfmac: merge two remaining brcmf_err macros\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-Now we always have __brcmf_err function we can do perfectly fine with\n-just one macro.\n-\n-Signed-off-by: Rafał Miłecki \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 14 +++++---------\n- 1 file changed, 5 insertions(+), 9 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-@@ -47,20 +47,16 @@\n- \n- __printf(2, 3)\n- void __brcmf_err(const char *func, const char *fmt, ...);\n--#ifndef CPTCFG_BRCM_TRACING\n--/* Macro for error messages. net_ratelimit() is used when driver\n-- * debugging is not selected. When debugging the driver error\n-- * messages are as important as other tracing or even more so.\n-+/* Macro for error messages. When debugging / tracing the driver all error\n-+ * messages are important to us.\n- */\n- #define brcmf_err(fmt, ...)\t\t\t\t\t\t\\\n- \tdo {\t\t\t\t\t\t\t\t\\\n--\t\tif (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit())\t\\\n-+\t\tif (IS_ENABLED(CPTCFG_BRCMDBG) ||\t\t\t\\\n-+\t\t IS_ENABLED(CPTCFG_BRCM_TRACING) ||\t\t\t\\\n-+\t\t net_ratelimit())\t\t\t\t\t\\\n- \t\t\t__brcmf_err(__func__, fmt, ##__VA_ARGS__);\t\\\n- \t} while (0)\n--#else\n--#define brcmf_err(fmt, ...) \\\n--\t__brcmf_err(__func__, fmt, ##__VA_ARGS__)\n--#endif\n- \n- #if defined(DEBUG) || defined(CPTCFG_BRCM_TRACING)\n- __printf(3, 4)\ndiff --git a/package/kernel/mac80211/patches/320-ath9k-clean-up-and-fix-ath_tx_count_airtime.patch b/package/kernel/mac80211/patches/320-ath9k-clean-up-and-fix-ath_tx_count_airtime.patch\ndeleted file mode 100644\nindex a6a3bfca6d..0000000000\n--- a/package/kernel/mac80211/patches/320-ath9k-clean-up-and-fix-ath_tx_count_airtime.patch\n+++ /dev/null\n@@ -1,107 +0,0 @@\n-From: Felix Fietkau \n-Date: Sun, 12 Feb 2017 13:13:05 +0100\n-Subject: [PATCH] ath9k: clean up and fix ath_tx_count_airtime\n-\n-ath_tx_count_airtime is doing a lot of unnecessary work:\n-\n-- Redundant station lookup\n-- Redundant rcu_read_lock/unlock\n-- Useless memcpy of bf->rates\n-- Useless NULL check of bf->bf_mpdu\n-- Redundant lookup of the skb tid\n-\n-Additionally, it tries to look up the mac80211 queue index from the txq,\n-which fails if the frame was delivered via the power save queue.\n-\n-This patch fixes all of these issues by passing down the right set of\n-pointers instead of doing extra work\n-\n-Cc: stable@vger.kernel.org\n-Fixes: 63fefa050477 (\"ath9k: Introduce airtime fairness scheduling between stations\")\n-Signed-off-by: Felix Fietkau \n----\n-\n---- a/drivers/net/wireless/ath/ath9k/xmit.c\n-+++ b/drivers/net/wireless/ath/ath9k/xmit.c\n-@@ -723,51 +723,31 @@ static bool bf_is_ampdu_not_probing(stru\n- return bf_isampdu(bf) && !(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);\n- }\n- \n--static void ath_tx_count_airtime(struct ath_softc *sc, struct ath_txq *txq,\n--\t\t\t\t struct ath_buf *bf, struct ath_tx_status *ts)\n-+static void ath_tx_count_airtime(struct ath_softc *sc, struct ath_node *an,\n-+\t\t\t\t struct ath_atx_tid *tid, struct ath_buf *bf,\n-+\t\t\t\t struct ath_tx_status *ts)\n- {\n--\tstruct ath_node *an;\n--\tstruct ath_acq *acq = &sc->cur_chan->acq[txq->mac80211_qnum];\n--\tstruct sk_buff *skb;\n--\tstruct ieee80211_hdr *hdr;\n--\tstruct ieee80211_hw *hw = sc->hw;\n--\tstruct ieee80211_tx_rate rates[4];\n--\tstruct ieee80211_sta *sta;\n--\tint i;\n-+\tstruct ath_txq *txq = tid->txq;\n- \tu32 airtime = 0;\n--\n--\tskb = bf->bf_mpdu;\n--\tif(!skb)\n--\t\treturn;\n--\n--\thdr = (struct ieee80211_hdr *)skb->data;\n--\tmemcpy(rates, bf->rates, sizeof(rates));\n--\n--\trcu_read_lock();\n--\n--\tsta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);\n--\tif(!sta)\n--\t\tgoto exit;\n--\n--\n--\tan = (struct ath_node *) sta->drv_priv;\n-+\tint i;\n- \n- \tairtime += ts->duration * (ts->ts_longretry + 1);\n-+\tfor(i = 0; i < ts->ts_rateindex; i++) {\n-+\t\tint rate_dur = ath9k_hw_get_duration(sc->sc_ah, bf->bf_desc, i);\n-+\t\tairtime += rate_dur * bf->rates[i].count;\n-+\t}\n- \n--\tfor(i=0; i < ts->ts_rateindex; i++)\n--\t\tairtime += ath9k_hw_get_duration(sc->sc_ah, bf->bf_desc, i) * rates[i].count;\n-+\tif (sc->airtime_flags & AIRTIME_USE_TX) {\n-+\t\tint q = txq->mac80211_qnum;\n-+\t\tstruct ath_acq *acq = &sc->cur_chan->acq[q];\n- \n--\tif (!!(sc->airtime_flags & AIRTIME_USE_TX)) {\n- \t\tspin_lock_bh(&acq->lock);\n--\t\tan->airtime_deficit[txq->mac80211_qnum] -= airtime;\n--\t\tif (an->airtime_deficit[txq->mac80211_qnum] <= 0)\n--\t\t\t__ath_tx_queue_tid(sc, ath_get_skb_tid(sc, an, skb));\n-+\t\tan->airtime_deficit[q] -= airtime;\n-+\t\tif (an->airtime_deficit[q] <= 0)\n-+\t\t\t__ath_tx_queue_tid(sc, tid);\n- \t\tspin_unlock_bh(&acq->lock);\n- \t}\n- \tath_debug_airtime(sc, an, 0, airtime);\n--\n--exit:\n--\trcu_read_unlock();\n- }\n- \n- static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,\n-@@ -791,13 +771,13 @@ static void ath_tx_process_buffer(struct\n- \n- \tts->duration = ath9k_hw_get_duration(sc->sc_ah, bf->bf_desc,\n- \t\t\t\t\t ts->ts_rateindex);\n--\tath_tx_count_airtime(sc, txq, bf, ts);\n- \n- \thdr = (struct ieee80211_hdr *) bf->bf_mpdu->data;\n- \tsta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);\n- \tif (sta) {\n- \t\tstruct ath_node *an = (struct ath_node *)sta->drv_priv;\n- \t\ttid = ath_get_skb_tid(sc, an, bf->bf_mpdu);\n-+\t\tath_tx_count_airtime(sc, an, tid, bf, ts);\n- \t\tif (ts->ts_status & (ATH9K_TXERR_FILT | ATH9K_TXERR_XRETRY))\n- \t\t\ttid->clear_ps_filter = true;\n- \t}\ndiff --git a/package/kernel/mac80211/patches/321-mac80211-fix-CSA-in-IBSS-mode.patch b/package/kernel/mac80211/patches/321-mac80211-fix-CSA-in-IBSS-mode.patch\ndeleted file mode 100644\nindex 13765b2900..0000000000\n--- a/package/kernel/mac80211/patches/321-mac80211-fix-CSA-in-IBSS-mode.patch\n+++ /dev/null\n@@ -1,34 +0,0 @@\n-From: Koen Vandeputte \n-Date: Wed, 8 Feb 2017 15:29:45 +0100\n-Subject: [PATCH] mac80211: fix CSA in IBSS mode\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-Add the missing IBSS capability flag during capability init as it needs\n-to be inserted into the generated beacon in order for CSA to work.\n-\n-Signed-off-by: Piotr Gawlowicz \n-Signed-off-by: Mikołaj Chwalisz \n-Tested-by: Koen Vandeputte \n----\n-\n---- a/net/mac80211/ibss.c\n-+++ b/net/mac80211/ibss.c\n-@@ -487,14 +487,14 @@ int ieee80211_ibss_csa_beacon(struct iee\n- \tstruct beacon_data *presp, *old_presp;\n- \tstruct cfg80211_bss *cbss;\n- \tconst struct cfg80211_bss_ies *ies;\n--\tu16 capability = 0;\n-+\tu16 capability = WLAN_CAPABILITY_IBSS;\n- \tu64 tsf;\n- \tint ret = 0;\n- \n- \tsdata_assert_lock(sdata);\n- \n- \tif (ifibss->privacy)\n--\t\tcapability = WLAN_CAPABILITY_PRIVACY;\n-+\t\tcapability |= WLAN_CAPABILITY_PRIVACY;\n- \n- \tcbss = cfg80211_get_bss(sdata->local->hw.wiphy, ifibss->chandef.chan,\n- \t\t\t\tifibss->bssid, ifibss->ssid,\ndiff --git a/package/kernel/mac80211/patches/322-mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch b/package/kernel/mac80211/patches/322-mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch\ndeleted file mode 100644\nindex 66e1bfb4c1..0000000000\n--- a/package/kernel/mac80211/patches/322-mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch\n+++ /dev/null\n@@ -1,28 +0,0 @@\n-From: Felix Fietkau \n-Date: Wed, 22 Feb 2017 16:13:17 +0100\n-Subject: [PATCH] mac80211: don't handle filtered frames within a BA session\n-\n-When running a BA session, the driver (or the hardware) already takes\n-care of retransmitting failed frames, since it has to keep the receiver\n-reorder window in sync.\n-\n-Adding another layer of retransmit around that does not improve\n-anything. In fact, it can only lead to some strong reordering with huge\n-latency.\n-\n-Cc: stable@vger.kernel.org\n-Signed-off-by: Felix Fietkau \n----\n-\n---- a/net/mac80211/status.c\n-+++ b/net/mac80211/status.c\n-@@ -51,7 +51,8 @@ static void ieee80211_handle_filtered_fr\n- \tstruct ieee80211_hdr *hdr = (void *)skb->data;\n- \tint ac;\n- \n--\tif (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER) {\n-+\tif (info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |\n-+\t\t\t IEEE80211_TX_CTL_AMPDU)) {\n- \t\tieee80211_free_txskb(&local->hw, skb);\n- \t\treturn;\n- \t}\ndiff --git a/package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch b/package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch\ndeleted file mode 100644\nindex 81567d8757..0000000000\n--- a/package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch\n+++ /dev/null\n@@ -1,112 +0,0 @@\n-From 91b632803ee4e47c5a5c4dc3d8bf5abf9c16107a Mon Sep 17 00:00:00 2001\n-From: Tobias Klauser \n-Date: Mon, 13 Feb 2017 11:14:09 +0100\n-Subject: [PATCH] brcmfmac: Use net_device_stats from struct net_device\n-\n-Instead of using a private copy of struct net_device_stats in struct\n-brcm_if, use stats from struct net_device. Also remove the now\n-unnecessary .ndo_get_stats function.\n-\n-Signed-off-by: Tobias Klauser \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 26 +++++++---------------\n- .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 --\n- 2 files changed, 8 insertions(+), 20 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-@@ -249,10 +249,10 @@ static netdev_tx_t brcmf_netdev_start_xm\n- \n- done:\n- \tif (ret) {\n--\t\tifp->stats.tx_dropped++;\n-+\t\tndev->stats.tx_dropped++;\n- \t} else {\n--\t\tifp->stats.tx_packets++;\n--\t\tifp->stats.tx_bytes += skb->len;\n-+\t\tndev->stats.tx_packets++;\n-+\t\tndev->stats.tx_bytes += skb->len;\n- \t}\n- \n- \t/* Return ok: we always eat the packet */\n-@@ -296,15 +296,15 @@ void brcmf_txflowblock(struct device *de\n- void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb)\n- {\n- \tif (skb->pkt_type == PACKET_MULTICAST)\n--\t\tifp->stats.multicast++;\n-+\t\tifp->ndev->stats.multicast++;\n- \n- \tif (!(ifp->ndev->flags & IFF_UP)) {\n- \t\tbrcmu_pkt_buf_free_skb(skb);\n- \t\treturn;\n- \t}\n- \n--\tifp->stats.rx_bytes += skb->len;\n--\tifp->stats.rx_packets++;\n-+\tifp->ndev->stats.rx_bytes += skb->len;\n-+\tifp->ndev->stats.rx_packets++;\n- \n- \tbrcmf_dbg(DATA, \"rx proto=0x%X\\n\", ntohs(skb->protocol));\n- \tif (in_interrupt())\n-@@ -327,7 +327,7 @@ static int brcmf_rx_hdrpull(struct brcmf\n- \n- \tif (ret || !(*ifp) || !(*ifp)->ndev) {\n- \t\tif (ret != -ENODATA && *ifp)\n--\t\t\t(*ifp)->stats.rx_errors++;\n-+\t\t\t(*ifp)->ndev->stats.rx_errors++;\n- \t\tbrcmu_pkt_buf_free_skb(skb);\n- \t\treturn -ENODATA;\n- \t}\n-@@ -388,7 +388,7 @@ void brcmf_txfinalize(struct brcmf_if *i\n- \t}\n- \n- \tif (!success)\n--\t\tifp->stats.tx_errors++;\n-+\t\tifp->ndev->stats.tx_errors++;\n- \n- \tbrcmu_pkt_buf_free_skb(txp);\n- }\n-@@ -411,15 +411,6 @@ void brcmf_txcomplete(struct device *dev\n- \t}\n- }\n- \n--static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev)\n--{\n--\tstruct brcmf_if *ifp = netdev_priv(ndev);\n--\n--\tbrcmf_dbg(TRACE, \"Enter, bsscfgidx=%d\\n\", ifp->bsscfgidx);\n--\n--\treturn &ifp->stats;\n--}\n--\n- static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,\n- \t\t\t\t struct ethtool_drvinfo *info)\n- {\n-@@ -492,7 +483,6 @@ static int brcmf_netdev_open(struct net_\n- static const struct net_device_ops brcmf_netdev_ops_pri = {\n- \t.ndo_open = brcmf_netdev_open,\n- \t.ndo_stop = brcmf_netdev_stop,\n--\t.ndo_get_stats = brcmf_netdev_get_stats,\n- \t.ndo_start_xmit = brcmf_netdev_start_xmit,\n- \t.ndo_set_mac_address = brcmf_netdev_set_mac_address,\n- \t.ndo_set_rx_mode = brcmf_netdev_set_multicast_list\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h\n-@@ -171,7 +171,6 @@ enum brcmf_netif_stop_reason {\n- * @drvr: points to device related information.\n- * @vif: points to cfg80211 specific interface information.\n- * @ndev: associated network device.\n-- * @stats: interface specific network statistics.\n- * @multicast_work: worker object for multicast provisioning.\n- * @ndoffload_work: worker object for neighbor discovery offload configuration.\n- * @fws_desc: interface specific firmware-signalling descriptor.\n-@@ -187,7 +186,6 @@ struct brcmf_if {\n- \tstruct brcmf_pub *drvr;\n- \tstruct brcmf_cfg80211_vif *vif;\n- \tstruct net_device *ndev;\n--\tstruct net_device_stats stats;\n- \tstruct work_struct multicast_work;\n- \tstruct work_struct ndoffload_work;\n- \tstruct brcmf_fws_mac_descriptor *fws_desc;\ndiff --git a/package/kernel/mac80211/patches/323-0002-brcmfmac-always-print-error-when-PSM-s-watchdog-fire.patch b/package/kernel/mac80211/patches/323-0002-brcmfmac-always-print-error-when-PSM-s-watchdog-fire.patch\ndeleted file mode 100644\nindex 7272b889c0..0000000000\n--- a/package/kernel/mac80211/patches/323-0002-brcmfmac-always-print-error-when-PSM-s-watchdog-fire.patch\n+++ /dev/null\n@@ -1,148 +0,0 @@\n-From f1ac3aa212af6dd0a36dc07a63f95f91be6f4935 Mon Sep 17 00:00:00 2001\n-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= \n-Date: Fri, 24 Feb 2017 17:32:46 +0100\n-Subject: [PATCH] brcmfmac: always print error when PSM's watchdog fires\n-MIME-Version: 1.0\n-Content-Type: text/plain; charset=UTF-8\n-Content-Transfer-Encoding: 8bit\n-\n-So far we were attaching BRCMF_E_PSM_WATCHDOG event listener in\n-brcmf_debug_attach which gets compiled only with CONFIG_BRCMDBG. This\n-event means something went wrong and firmware / hardware usually can't\n-be expected to work (reliably).\n-\n-Such a problem is significant for user experience so I believe we should\n-print an error unconditionally (even with debugging disabled). What can\n-be indeed optional is dumping bus memory as this is clearly part of\n-debugging process.\n-\n-In the future we may also try to extend this listener by trying to\n-recover from the error or at least signal it to the cfg80211.\n-\n-Signed-off-by: Rafał Miłecki \n-Signed-off-by: Kalle Valo \n----\n- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 22 ++++++++++++++++++\n- .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 26 +++-------------------\n- .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 9 ++++++++\n- 3 files changed, 34 insertions(+), 23 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-@@ -738,6 +738,24 @@ void brcmf_remove_interface(struct brcmf\n- \tbrcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);\n- }\n- \n-+static int brcmf_psm_watchdog_notify(struct brcmf_if *ifp,\n-+\t\t\t\t const struct brcmf_event_msg *evtmsg,\n-+\t\t\t\t void *data)\n-+{\n-+\tint err;\n-+\n-+\tbrcmf_dbg(TRACE, \"enter: bsscfgidx=%d\\n\", ifp->bsscfgidx);\n-+\n-+\tbrcmf_err(\"PSM's watchdog has fired!\\n\");\n-+\n-+\terr = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,\n-+\t\t\t\t\t evtmsg->datalen);\n-+\tif (err)\n-+\t\tbrcmf_err(\"Failed to get memory dump, %d\\n\", err);\n-+\n-+\treturn err;\n-+}\n-+\n- #ifdef CONFIG_INET\n- #define ARPOL_MAX_ENTRIES\t8\n- static int brcmf_inetaddr_changed(struct notifier_block *nb,\n-@@ -917,6 +935,10 @@ int brcmf_attach(struct device *dev, str\n- \t\tgoto fail;\n- \t}\n- \n-+\t/* Attach to events important for core code */\n-+\tbrcmf_fweh_register(drvr, BRCMF_E_PSM_WATCHDOG,\n-+\t\t\t brcmf_psm_watchdog_notify);\n-+\n- \t/* attach firmware event handler */\n- \tbrcmf_fweh_attach(drvr);\n- \n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c\n-@@ -27,8 +27,8 @@\n- \n- static struct dentry *root_folder;\n- \n--static int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,\n--\t\t\t\t size_t len)\n-+int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,\n-+\t\t\t size_t len)\n- {\n- \tvoid *dump;\n- \tsize_t ramsize;\n-@@ -54,24 +54,6 @@ static int brcmf_debug_create_memdump(st\n- \treturn 0;\n- }\n- \n--static int brcmf_debug_psm_watchdog_notify(struct brcmf_if *ifp,\n--\t\t\t\t\t const struct brcmf_event_msg *evtmsg,\n--\t\t\t\t\t void *data)\n--{\n--\tint err;\n--\n--\tbrcmf_dbg(TRACE, \"enter: bsscfgidx=%d\\n\", ifp->bsscfgidx);\n--\n--\tbrcmf_err(\"PSM's watchdog has fired!\\n\");\n--\n--\terr = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,\n--\t\t\t\t\t evtmsg->datalen);\n--\tif (err)\n--\t\tbrcmf_err(\"Failed to get memory dump, %d\\n\", err);\n--\n--\treturn err;\n--}\n--\n- void brcmf_debugfs_init(void)\n- {\n- \troot_folder = debugfs_create_dir(KBUILD_MODNAME, NULL);\n-@@ -99,9 +81,7 @@ int brcmf_debug_attach(struct brcmf_pub\n- \tif (IS_ERR(drvr->dbgfs_dir))\n- \t\treturn PTR_ERR(drvr->dbgfs_dir);\n- \n--\n--\treturn brcmf_fweh_register(drvr, BRCMF_E_PSM_WATCHDOG,\n--\t\t\t\t brcmf_debug_psm_watchdog_notify);\n-+\treturn 0;\n- }\n- \n- void brcmf_debug_detach(struct brcmf_pub *drvr)\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-@@ -99,6 +99,7 @@ do {\t\t\t\t\t\t\t\t\t\\\n- \n- extern int brcmf_msg_level;\n- \n-+struct brcmf_bus;\n- struct brcmf_pub;\n- #ifdef DEBUG\n- void brcmf_debugfs_init(void);\n-@@ -108,6 +109,8 @@ void brcmf_debug_detach(struct brcmf_pub\n- struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);\n- int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,\n- \t\t\t int (*read_fn)(struct seq_file *seq, void *data));\n-+int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,\n-+\t\t\t size_t len);\n- #else\n- static inline void brcmf_debugfs_init(void)\n- {\n-@@ -128,6 +131,12 @@ int brcmf_debugfs_add_entry(struct brcmf\n- {\n- \treturn 0;\n- }\n-+static inline\n-+int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,\n-+\t\t\t size_t len)\n-+{\n-+\treturn 0;\n-+}\n- #endif\n- \n- #endif /* BRCMFMAC_DEBUG_H */\ndiff --git a/package/kernel/mac80211/patches/323-0003-brcmfmac-Do-not-print-the-firmware-version-as-an-err.patch b/package/kernel/mac80211/patches/323-0003-brcmfmac-Do-not-print-the-firmware-version-as-an-err.patch\ndeleted file mode 100644\nindex 3ab9b66e08..0000000000\n--- a/package/kernel/mac80211/patches/323-0003-brcmfmac-Do-not-print-the-firmware-version-as-an-err.patch\n+++ /dev/null\n@@ -1,56 +0,0 @@\n-From d79fe4cb70d8deab7b8dc1de547ed4b915574414 Mon Sep 17 00:00:00 2001\n-From: Hans de Goede \n-Date: Wed, 8 Mar 2017 14:50:15 +0100\n-Subject: [PATCH] brcmfmac: Do not print the firmware version as an error\n-\n-Using pr_err for things which are not errors is a bad idea. E.g. it\n-will cause the plymouth bootsplash screen to drop back to the text\n-console so that the user can see the error, which is not what we\n-normally want to happen.\n-\n-Instead add a new brcmf_info macro and use that.\n-\n-Signed-off-by: Hans de Goede \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +-\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 9 +++++++++\n- 2 files changed, 10 insertions(+), 1 deletion(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c\n-@@ -161,7 +161,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i\n- \tstrsep(&ptr, \"\\n\");\n- \n- \t/* Print fw version info */\n--\tbrcmf_err(\"Firmware version = %s\\n\", buf);\n-+\tbrcmf_info(\"Firmware version = %s\\n\", buf);\n- \n- \t/* locate firmware version number for ethtool */\n- \tptr = strrchr(buf, ' ') + 1;\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h\n-@@ -59,6 +59,10 @@ void __brcmf_err(const char *func, const\n- \t} while (0)\n- \n- #if defined(DEBUG) || defined(CPTCFG_BRCM_TRACING)\n-+\n-+/* For debug/tracing purposes treat info messages as errors */\n-+#define brcmf_info brcmf_err\n-+\n- __printf(3, 4)\n- void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...);\n- #define brcmf_dbg(level, fmt, ...)\t\t\t\t\\\n-@@ -77,6 +81,11 @@ do {\t\t\t\t\t\t\t\t\\\n- \n- #else /* defined(DEBUG) || defined(CPTCFG_BRCM_TRACING) */\n- \n-+#define brcmf_info(fmt, ...)\t\t\t\t\t\t\\\n-+\tdo {\t\t\t\t\t\t\t\t\\\n-+\t\tpr_info(\"%s: \" fmt, __func__, ##__VA_ARGS__);\t\t\\\n-+\t} while (0)\n-+\n- #define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)\n- \n- #define BRCMF_DATA_ON()\t\t0\ndiff --git a/package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch b/package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch\ndeleted file mode 100644\nindex f4570e71b1..0000000000\n--- a/package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch\n+++ /dev/null\n@@ -1,28 +0,0 @@\n-From 26e537884a8ef451f5c60f6949b1615069931ffa Mon Sep 17 00:00:00 2001\n-From: Hans de Goede \n-Date: Wed, 8 Mar 2017 14:50:16 +0100\n-Subject: [PATCH] brcmfmac: Do not complain about country code \"00\"\n-\n-The country code gets set to \"00\" by default at boot, ignore this\n-rather then logging an error about it.\n-\n-Signed-off-by: Hans de Goede \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++++\n- 1 file changed, 4 insertions(+)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-@@ -6736,6 +6736,10 @@ static void brcmf_cfg80211_reg_notifier(\n- \ts32 err;\n- \tint i;\n- \n-+\t/* The country code gets set to \"00\" by default at boot, ignore */\n-+\tif (req->alpha2[0] == '0' && req->alpha2[1] == '0')\n-+\t\treturn;\n-+\n- \t/* ignore non-ISO3166 country codes */\n- \tfor (i = 0; i < sizeof(req->alpha2); i++)\n- \t\tif (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {\ndiff --git a/package/kernel/mac80211/patches/323-0005-brcmfmac-Handle-status-BRCMF_E_STATUS_ABORT-in-cfg80.patch b/package/kernel/mac80211/patches/323-0005-brcmfmac-Handle-status-BRCMF_E_STATUS_ABORT-in-cfg80.patch\ndeleted file mode 100644\nindex 0f2d54e1dd..0000000000\n--- a/package/kernel/mac80211/patches/323-0005-brcmfmac-Handle-status-BRCMF_E_STATUS_ABORT-in-cfg80.patch\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-From b9472a2e3e452c414634b3ccb1ef6c4098878686 Mon Sep 17 00:00:00 2001\n-From: Hans de Goede \n-Date: Wed, 8 Mar 2017 14:50:17 +0100\n-Subject: [PATCH] brcmfmac: Handle status == BRCMF_E_STATUS_ABORT in\n- cfg80211_escan_handler\n-\n-If a scan gets aborted BRCMF_SCAN_STATUS_BUSY gets cleared in\n-cfg->scan_status and when we receive an abort event from the firmware\n-the BRCMF_SCAN_STATUS_BUSY check in the cfg80211_escan_handler will\n-trigger resulting in multiple errors getting logged.\n-\n-Check for a status of BRCMF_E_STATUS_ABORT and in this case simply\n-cleanly exit the cfg80211_escan_handler. This also avoids a\n-BRCMF_E_STATUS_ABORT event arriving after a new scan has been started\n-causing the new scan to complete prematurely without any data.\n-\n-Signed-off-by: Hans de Goede \n-Acked-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++\n- 1 file changed, 3 insertions(+)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-@@ -3097,6 +3097,9 @@ brcmf_cfg80211_escan_handler(struct brcm\n- \n- \tstatus = e->status;\n- \n-+\tif (status == BRCMF_E_STATUS_ABORT)\n-+\t\tgoto exit;\n-+\n- \tif (!test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {\n- \t\tbrcmf_err(\"scan not ready, bsscfgidx=%d\\n\", ifp->bsscfgidx);\n- \t\treturn -EPERM;\ndiff --git a/package/kernel/mac80211/patches/323-0006-brcmfmac-move-brcmf_txflowblock-to-bcdc-layer.patch b/package/kernel/mac80211/patches/323-0006-brcmfmac-move-brcmf_txflowblock-to-bcdc-layer.patch\ndeleted file mode 100644\nindex b947cd1de9..0000000000\n--- a/package/kernel/mac80211/patches/323-0006-brcmfmac-move-brcmf_txflowblock-to-bcdc-layer.patch\n+++ /dev/null\n@@ -1,137 +0,0 @@\n-From 20ec4f57498f8770c7a1a3e2a316fa752a424178 Mon Sep 17 00:00:00 2001\n-From: Franky Lin \n-Date: Fri, 10 Mar 2017 21:17:02 +0000\n-Subject: [PATCH] brcmfmac: move brcmf_txflowblock to bcdc layer\n-\n-brcmf_txflowblock is invoked by sdio and usb bus module which are using\n-bcdc protocol. This patch makes it a bcdc API instead of a core module\n-function.\n-\n-Reviewed-by: Arend Van Spriel \n-Signed-off-by: Franky Lin \n-Signed-off-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 10 ++++++++++\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 1 +\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 2 --\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 10 ----------\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +++--\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 5 +++--\n- 6 files changed, 17 insertions(+), 16 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-@@ -345,6 +345,16 @@ brcmf_proto_bcdc_txdata(struct brcmf_pub\n- \treturn brcmf_bus_txdata(drvr->bus_if, pktbuf);\n- }\n- \n-+void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state)\n-+{\n-+\tstruct brcmf_bus *bus_if = dev_get_drvdata(dev);\n-+\tstruct brcmf_pub *drvr = bus_if->drvr;\n-+\n-+\tbrcmf_dbg(TRACE, \"Enter\\n\");\n-+\n-+\tbrcmf_fws_bus_blocked(drvr, state);\n-+}\n-+\n- static void\n- brcmf_proto_bcdc_configure_addr_mode(struct brcmf_pub *drvr, int ifidx,\n- \t\t\t\t enum proto_addr_mode addr_mode)\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h\n-@@ -19,6 +19,7 @@\n- #ifdef CPTCFG_BRCMFMAC_PROTO_BCDC\n- int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr);\n- void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr);\n-+void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state);\n- #else\n- static inline int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) { return 0; }\n- static inline void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr) {}\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h\n-@@ -229,8 +229,6 @@ int brcmf_attach(struct device *dev, str\n- void brcmf_detach(struct device *dev);\n- /* Indication from bus module that dongle should be reset */\n- void brcmf_dev_reset(struct device *dev);\n--/* Indication from bus module to change flow-control state */\n--void brcmf_txflowblock(struct device *dev, bool state);\n- \n- /* Notify the bus has transferred the tx packet to firmware */\n- void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success);\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-@@ -283,16 +283,6 @@ void brcmf_txflowblock_if(struct brcmf_i\n- \tspin_unlock_irqrestore(&ifp->netif_stop_lock, flags);\n- }\n- \n--void brcmf_txflowblock(struct device *dev, bool state)\n--{\n--\tstruct brcmf_bus *bus_if = dev_get_drvdata(dev);\n--\tstruct brcmf_pub *drvr = bus_if->drvr;\n--\n--\tbrcmf_dbg(TRACE, \"Enter\\n\");\n--\n--\tbrcmf_fws_bus_blocked(drvr, state);\n--}\n--\n- void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb)\n- {\n- \tif (skb->pkt_type == PACKET_MULTICAST)\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c\n-@@ -44,6 +44,7 @@\n- #include \"firmware.h\"\n- #include \"core.h\"\n- #include \"common.h\"\n-+#include \"bcdc.h\"\n- \n- #define DCMD_RESP_TIMEOUT\tmsecs_to_jiffies(2500)\n- #define CTL_DONE_TIMEOUT\tmsecs_to_jiffies(2500)\n-@@ -2328,7 +2329,7 @@ static uint brcmf_sdio_sendfromq(struct\n- \tif ((bus->sdiodev->state == BRCMF_SDIOD_DATA) &&\n- \t bus->txoff && (pktq_len(&bus->txq) < TXLOW)) {\n- \t\tbus->txoff = false;\n--\t\tbrcmf_txflowblock(bus->sdiodev->dev, false);\n-+\t\tbrcmf_proto_bcdc_txflowblock(bus->sdiodev->dev, false);\n- \t}\n- \n- \treturn cnt;\n-@@ -2753,7 +2754,7 @@ static int brcmf_sdio_bus_txdata(struct\n- \n- \tif (pktq_len(&bus->txq) >= TXHI) {\n- \t\tbus->txoff = true;\n--\t\tbrcmf_txflowblock(dev, true);\n-+\t\tbrcmf_proto_bcdc_txflowblock(dev, true);\n- \t}\n- \tspin_unlock_bh(&bus->txq_lock);\n- \n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c\n-@@ -29,6 +29,7 @@\n- #include \"usb.h\"\n- #include \"core.h\"\n- #include \"common.h\"\n-+#include \"bcdc.h\"\n- \n- \n- #define IOCTL_RESP_TIMEOUT\t\tmsecs_to_jiffies(2000)\n-@@ -488,7 +489,7 @@ static void brcmf_usb_tx_complete(struct\n- \tspin_lock_irqsave(&devinfo->tx_flowblock_lock, flags);\n- \tif (devinfo->tx_freecount > devinfo->tx_high_watermark &&\n- \t\tdevinfo->tx_flowblock) {\n--\t\tbrcmf_txflowblock(devinfo->dev, false);\n-+\t\tbrcmf_proto_bcdc_txflowblock(devinfo->dev, false);\n- \t\tdevinfo->tx_flowblock = false;\n- \t}\n- \tspin_unlock_irqrestore(&devinfo->tx_flowblock_lock, flags);\n-@@ -635,7 +636,7 @@ static int brcmf_usb_tx(struct device *d\n- \tspin_lock_irqsave(&devinfo->tx_flowblock_lock, flags);\n- \tif (devinfo->tx_freecount < devinfo->tx_low_watermark &&\n- \t !devinfo->tx_flowblock) {\n--\t\tbrcmf_txflowblock(dev, true);\n-+\t\tbrcmf_proto_bcdc_txflowblock(dev, true);\n- \t\tdevinfo->tx_flowblock = true;\n- \t}\n- \tspin_unlock_irqrestore(&devinfo->tx_flowblock_lock, flags);\ndiff --git a/package/kernel/mac80211/patches/323-0007-brcmfmac-move-brcmf_txcomplete-to-bcdc-layer.patch b/package/kernel/mac80211/patches/323-0007-brcmfmac-move-brcmf_txcomplete-to-bcdc-layer.patch\ndeleted file mode 100644\nindex 9614e53e51..0000000000\n--- a/package/kernel/mac80211/patches/323-0007-brcmfmac-move-brcmf_txcomplete-to-bcdc-layer.patch\n+++ /dev/null\n@@ -1,122 +0,0 @@\n-From 7b584396b7a760bc77bbde4625f83ef173159d3e Mon Sep 17 00:00:00 2001\n-From: Franky Lin \n-Date: Fri, 10 Mar 2017 21:17:03 +0000\n-Subject: [PATCH] brcmfmac: move brcmf_txcomplete to bcdc layer\n-\n-brcmf_txcomplete is invoked by sdio and usb bus module which are using\n-bcdc protocol. So move it from core module into bcdc layer.\n-\n-Signed-off-by: Franky Lin \n-Signed-off-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- .../net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 20 ++++++++++++++++++++\n- .../net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 2 ++\n- .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 3 ---\n- .../net/wireless/broadcom/brcm80211/brcmfmac/core.c | 18 ------------------\n- .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 ++-\n- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +-\n- 6 files changed, 25 insertions(+), 23 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-@@ -355,6 +355,26 @@ void brcmf_proto_bcdc_txflowblock(struct\n- \tbrcmf_fws_bus_blocked(drvr, state);\n- }\n- \n-+void\n-+brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,\n-+\t\t\t bool success)\n-+{\n-+\tstruct brcmf_bus *bus_if = dev_get_drvdata(dev);\n-+\tstruct brcmf_pub *drvr = bus_if->drvr;\n-+\tstruct brcmf_if *ifp;\n-+\n-+\t/* await txstatus signal for firmware if active */\n-+\tif (brcmf_fws_fc_active(drvr->fws)) {\n-+\t\tif (!success)\n-+\t\t\tbrcmf_fws_bustxfail(drvr->fws, txp);\n-+\t} else {\n-+\t\tif (brcmf_proto_bcdc_hdrpull(drvr, false, txp, &ifp))\n-+\t\t\tbrcmu_pkt_buf_free_skb(txp);\n-+\t\telse\n-+\t\t\tbrcmf_txfinalize(ifp, txp, success);\n-+\t}\n-+}\n-+\n- static void\n- brcmf_proto_bcdc_configure_addr_mode(struct brcmf_pub *drvr, int ifidx,\n- \t\t\t\t enum proto_addr_mode addr_mode)\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h\n-@@ -20,6 +20,8 @@\n- int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr);\n- void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr);\n- void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state);\n-+void brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,\n-+\t\t\t\t bool success);\n- #else\n- static inline int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) { return 0; }\n- static inline void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr) {}\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h\n-@@ -230,9 +230,6 @@ void brcmf_detach(struct device *dev);\n- /* Indication from bus module that dongle should be reset */\n- void brcmf_dev_reset(struct device *dev);\n- \n--/* Notify the bus has transferred the tx packet to firmware */\n--void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success);\n--\n- /* Configure the \"global\" bus state used by upper layers */\n- void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);\n- \n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-@@ -383,24 +383,6 @@ void brcmf_txfinalize(struct brcmf_if *i\n- \tbrcmu_pkt_buf_free_skb(txp);\n- }\n- \n--void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)\n--{\n--\tstruct brcmf_bus *bus_if = dev_get_drvdata(dev);\n--\tstruct brcmf_pub *drvr = bus_if->drvr;\n--\tstruct brcmf_if *ifp;\n--\n--\t/* await txstatus signal for firmware if active */\n--\tif (brcmf_fws_fc_active(drvr->fws)) {\n--\t\tif (!success)\n--\t\t\tbrcmf_fws_bustxfail(drvr->fws, txp);\n--\t} else {\n--\t\tif (brcmf_proto_hdrpull(drvr, false, txp, &ifp))\n--\t\t\tbrcmu_pkt_buf_free_skb(txp);\n--\t\telse\n--\t\t\tbrcmf_txfinalize(ifp, txp, success);\n--\t}\n--}\n--\n- static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,\n- \t\t\t\t struct ethtool_drvinfo *info)\n- {\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c\n-@@ -2266,7 +2266,8 @@ done:\n- \t\tbus->tx_seq = (bus->tx_seq + pktq->qlen) % SDPCM_SEQ_WRAP;\n- \tskb_queue_walk_safe(pktq, pkt_next, tmp) {\n- \t\t__skb_unlink(pkt_next, pktq);\n--\t\tbrcmf_txcomplete(bus->sdiodev->dev, pkt_next, ret == 0);\n-+\t\tbrcmf_proto_bcdc_txcomplete(bus->sdiodev->dev, pkt_next,\n-+\t\t\t\t\t ret == 0);\n- \t}\n- \treturn ret;\n- }\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c\n-@@ -483,7 +483,7 @@ static void brcmf_usb_tx_complete(struct\n- \t\t req->skb);\n- \tbrcmf_usb_del_fromq(devinfo, req);\n- \n--\tbrcmf_txcomplete(devinfo->dev, req->skb, urb->status == 0);\n-+\tbrcmf_proto_bcdc_txcomplete(devinfo->dev, req->skb, urb->status == 0);\n- \treq->skb = NULL;\n- \tbrcmf_usb_enq(devinfo, &devinfo->tx_freeq, req, &devinfo->tx_freecount);\n- \tspin_lock_irqsave(&devinfo->tx_flowblock_lock, flags);\ndiff --git a/package/kernel/mac80211/patches/323-0008-brcmfmac-wrap-brcmf_fws_add_interface-into-bcdc-laye.patch b/package/kernel/mac80211/patches/323-0008-brcmfmac-wrap-brcmf_fws_add_interface-into-bcdc-laye.patch\ndeleted file mode 100644\nindex a68c6ab0c3..0000000000\n--- a/package/kernel/mac80211/patches/323-0008-brcmfmac-wrap-brcmf_fws_add_interface-into-bcdc-laye.patch\n+++ /dev/null\n@@ -1,95 +0,0 @@\n-From 9fdc64bbdbe7bd546e0fbcedd2f1c03448c6df42 Mon Sep 17 00:00:00 2001\n-From: Franky Lin \n-Date: Fri, 10 Mar 2017 21:17:04 +0000\n-Subject: [PATCH] brcmfmac: wrap brcmf_fws_add_interface into bcdc layer\n-\n-fwsignal is only used by bcdc. Create a new protocol interface function\n-brcmf_proto_add_if for core module to notify protocol layer upon a new\n-interface is created.\n-\n-Signed-off-by: Franky Lin \n-Signed-off-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 +++++++\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +-\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 3 ++-\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++\n- 4 files changed, 19 insertions(+), 2 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-@@ -399,6 +399,12 @@ static void brcmf_proto_bcdc_rxreorder(s\n- \tbrcmf_fws_rxreorder(ifp, skb);\n- }\n- \n-+static void\n-+brcmf_proto_bcdc_add_if(struct brcmf_if *ifp)\n-+{\n-+\tbrcmf_fws_add_interface(ifp);\n-+}\n-+\n- int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)\n- {\n- \tstruct brcmf_bcdc *bcdc;\n-@@ -422,6 +428,7 @@ int brcmf_proto_bcdc_attach(struct brcmf\n- \tdrvr->proto->delete_peer = brcmf_proto_bcdc_delete_peer;\n- \tdrvr->proto->add_tdls_peer = brcmf_proto_bcdc_add_tdls_peer;\n- \tdrvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;\n-+\tdrvr->proto->add_if = brcmf_proto_bcdc_add_if;\n- \tdrvr->proto->pd = bcdc;\n- \n- \tdrvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-@@ -990,7 +990,7 @@ int brcmf_bus_started(struct device *dev\n- \tif (ret < 0)\n- \t\tgoto fail;\n- \n--\tbrcmf_fws_add_interface(ifp);\n-+\tbrcmf_proto_add_if(drvr, ifp);\n- \n- \tdrvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev,\n- \t\t\t\t\t drvr->settings->p2p_enable);\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c\n-@@ -25,6 +25,7 @@\n- #include \"fwsignal.h\"\n- #include \"fweh.h\"\n- #include \"fwil.h\"\n-+#include \"proto.h\"\n- \n- /**\n- * struct brcmf_fweh_queue_item - event item on event queue.\n-@@ -172,7 +173,7 @@ static void brcmf_fweh_handle_if_event(s\n- \t\tif (IS_ERR(ifp))\n- \t\t\treturn;\n- \t\tif (!is_p2pdev)\n--\t\t\tbrcmf_fws_add_interface(ifp);\n-+\t\t\tbrcmf_proto_add_if(drvr, ifp);\n- \t\tif (!drvr->fweh.evt_handler[BRCMF_E_IF])\n- \t\t\tif (brcmf_net_attach(ifp, false) < 0)\n- \t\t\t\treturn;\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h\n-@@ -44,6 +44,7 @@ struct brcmf_proto {\n- \tvoid (*add_tdls_peer)(struct brcmf_pub *drvr, int ifidx,\n- \t\t\t u8 peer[ETH_ALEN]);\n- \tvoid (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);\n-+\tvoid (*add_if)(struct brcmf_if *ifp);\n- \tvoid *pd;\n- };\n- \n-@@ -118,4 +119,12 @@ brcmf_proto_rxreorder(struct brcmf_if *i\n- \tifp->drvr->proto->rxreorder(ifp, skb);\n- }\n- \n-+static inline void\n-+brcmf_proto_add_if(struct brcmf_pub *drvr, struct brcmf_if *ifp)\n-+{\n-+\tif (!drvr->proto->add_if)\n-+\t\treturn;\n-+\tdrvr->proto->add_if(ifp);\n-+}\n-+\n- #endif /* BRCMFMAC_PROTO_H */\ndiff --git a/package/kernel/mac80211/patches/323-0009-brcmfmac-wrap-brcmf_fws_del_interface-into-bcdc-laye.patch b/package/kernel/mac80211/patches/323-0009-brcmfmac-wrap-brcmf_fws_del_interface-into-bcdc-laye.patch\ndeleted file mode 100644\nindex ded8d7b944..0000000000\n--- a/package/kernel/mac80211/patches/323-0009-brcmfmac-wrap-brcmf_fws_del_interface-into-bcdc-laye.patch\n+++ /dev/null\n@@ -1,83 +0,0 @@\n-From c02a5eb82056f75615cb48aa540bfd245f489b99 Mon Sep 17 00:00:00 2001\n-From: Franky Lin \n-Date: Fri, 10 Mar 2017 21:17:05 +0000\n-Subject: [PATCH] brcmfmac: wrap brcmf_fws_del_interface into bcdc layer\n-\n-Create a new protocol interface function brcmf_proto_del_if for core\n-module to notify protocol layer upon interface deletion.\n-\n-Signed-off-by: Franky Lin \n-Signed-off-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 +++++++\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 4 ++--\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++\n- 3 files changed, 18 insertions(+), 2 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-@@ -405,6 +405,12 @@ brcmf_proto_bcdc_add_if(struct brcmf_if\n- \tbrcmf_fws_add_interface(ifp);\n- }\n- \n-+static void\n-+brcmf_proto_bcdc_del_if(struct brcmf_if *ifp)\n-+{\n-+\tbrcmf_fws_del_interface(ifp);\n-+}\n-+\n- int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)\n- {\n- \tstruct brcmf_bcdc *bcdc;\n-@@ -429,6 +435,7 @@ int brcmf_proto_bcdc_attach(struct brcmf\n- \tdrvr->proto->add_tdls_peer = brcmf_proto_bcdc_add_tdls_peer;\n- \tdrvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;\n- \tdrvr->proto->add_if = brcmf_proto_bcdc_add_if;\n-+\tdrvr->proto->del_if = brcmf_proto_bcdc_del_if;\n- \tdrvr->proto->pd = bcdc;\n- \n- \tdrvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-@@ -706,7 +706,7 @@ void brcmf_remove_interface(struct brcmf\n- \t\treturn;\n- \tbrcmf_dbg(TRACE, \"Enter, bsscfgidx=%d, ifidx=%d\\n\", ifp->bsscfgidx,\n- \t\t ifp->ifidx);\n--\tbrcmf_fws_del_interface(ifp);\n-+\tbrcmf_proto_del_if(ifp->drvr, ifp);\n- \tbrcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);\n- }\n- \n-@@ -1035,7 +1035,7 @@ fail:\n- \t\tdrvr->config = NULL;\n- \t}\n- \tif (drvr->fws) {\n--\t\tbrcmf_fws_del_interface(ifp);\n-+\t\tbrcmf_proto_del_if(ifp->drvr, ifp);\n- \t\tbrcmf_fws_deinit(drvr);\n- \t}\n- \tbrcmf_net_detach(ifp->ndev, false);\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h\n-@@ -45,6 +45,7 @@ struct brcmf_proto {\n- \t\t\t u8 peer[ETH_ALEN]);\n- \tvoid (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);\n- \tvoid (*add_if)(struct brcmf_if *ifp);\n-+\tvoid (*del_if)(struct brcmf_if *ifp);\n- \tvoid *pd;\n- };\n- \n-@@ -127,4 +128,12 @@ brcmf_proto_add_if(struct brcmf_pub *drv\n- \tdrvr->proto->add_if(ifp);\n- }\n- \n-+static inline void\n-+brcmf_proto_del_if(struct brcmf_pub *drvr, struct brcmf_if *ifp)\n-+{\n-+\tif (!drvr->proto->del_if)\n-+\t\treturn;\n-+\tdrvr->proto->del_if(ifp);\n-+}\n-+\n- #endif /* BRCMFMAC_PROTO_H */\ndiff --git a/package/kernel/mac80211/patches/323-0010-brcmfmac-wrap-brcmf_fws_reset_interface-into-bcdc-la.patch b/package/kernel/mac80211/patches/323-0010-brcmfmac-wrap-brcmf_fws_reset_interface-into-bcdc-la.patch\ndeleted file mode 100644\nindex 34e71d8f5c..0000000000\n--- a/package/kernel/mac80211/patches/323-0010-brcmfmac-wrap-brcmf_fws_reset_interface-into-bcdc-la.patch\n+++ /dev/null\n@@ -1,82 +0,0 @@\n-From 66ded1f8b33cdd9d6d3e20f5f8dd23615a110e70 Mon Sep 17 00:00:00 2001\n-From: Franky Lin \n-Date: Fri, 10 Mar 2017 21:17:06 +0000\n-Subject: [PATCH] brcmfmac: wrap brcmf_fws_reset_interface into bcdc layer\n-\n-Create a new protocol interface function brcmf_proto_reset_if for core\n-module to notify protocol layer when interface role changes.\n-\n-Signed-off-by: Franky Lin \n-Signed-off-by: Arend van Spriel \n-Signed-off-by: Kalle Valo \n----\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 +++++++\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 3 +--\n- drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++\n- 3 files changed, 17 insertions(+), 2 deletions(-)\n-\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c\n-@@ -411,6 +411,12 @@ brcmf_proto_bcdc_del_if(struct brcmf_if\n- \tbrcmf_fws_del_interface(ifp);\n- }\n- \n-+static void\n-+brcmf_proto_bcdc_reset_if(struct brcmf_if *ifp)\n-+{\n-+\tbrcmf_fws_reset_interface(ifp);\n-+}\n-+\n- int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)\n- {\n- \tstruct brcmf_bcdc *bcdc;\n-@@ -436,6 +442,7 @@ int brcmf_proto_bcdc_attach(struct brcmf\n- \tdrvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;\n- \tdrvr->proto->add_if = brcmf_proto_bcdc_add_if;\n- \tdrvr->proto->del_if = brcmf_proto_bcdc_del_if;\n-+\tdrvr->proto->reset_if = brcmf_proto_bcdc_reset_if;\n- \tdrvr->proto->pd = bcdc;\n- \n- \tdrvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;\n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c\n-@@ -22,7 +22,6 @@\n- #include \"core.h\"\n- #include \"debug.h\"\n- #include \"tracepoint.h\"\n--#include \"fwsignal.h\"\n- #include \"fweh.h\"\n- #include \"fwil.h\"\n- #include \"proto.h\"\n-@@ -180,7 +179,7 @@ static void brcmf_fweh_handle_if_event(s\n- \t}\n- \n- \tif (ifp && ifevent->action == BRCMF_E_IF_CHANGE)\n--\t\tbrcmf_fws_reset_interface(ifp);\n-+\t\tbrcmf_proto_reset_if(drvr, ifp);\n- \n- \terr = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);\n- \n---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h\n-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h\n-@@ -46,6 +46,7 @@ struct brcmf_proto {\n- \tvoid (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);\n- \tvoid (*add_if)(struct brcmf_if *ifp);\n- \tvoid (*del_if)(struct brcmf_if *ifp);\n-+\tvoid (*reset_if)(struct brcmf_if *ifp);\n- \tvoid *pd;\n- };\n- \n-@@ -136,4 +137,12 @@ brcmf_proto_del_if(struct brcmf_pub *drv\n- \tdrvr->proto->del_if(ifp);\n- }\n- \n-+static inline void\n-+brcmf_proto_reset_if(struct brcmf_pub *drvr, struct brcmf_if *ifp)\n-+{\n-+\tif (!drvr->proto->reset_if)\n-+\t\treturn;\n-+\tdrvr->proto->reset_if(ifp);\n-+}\n-+\n- #endif /* BRCMFMAC_PROTO_H */\ndiff --git a/package/kernel/mac80211/patches/325-mac80211-unconditionally-start-new-netdev-queues-wit.patch b/package/kernel/mac80211/patches/325-mac80211-unconditionally-start-new-netdev-queues-wit.patch\ndeleted file mode 100644\nindex ff7bbcb645..0000000000\n--- a/package/kernel/mac80211/patches/325-mac80211-unconditionally-start-new-netdev-queues-wit.patch\n+++ /dev/null\n@@ -1,29 +0,0 @@\n-From: Johannes Berg \n-Date: Wed, 29 Mar 2017 14:15:24 +0200\n-Subject: [PATCH] mac80211: unconditionally start new netdev queues with iTXQ\n- support\n-\n-When internal mac80211 TXQs aren't supported, netdev queues must\n-always started out started even when driver queues are stopped\n-while the interface is added. This is necessary because with the\n-internal TXQ support netdev queues are never stopped and packet\n-scheduling/dropping is done in mac80211.\n-\n-Cc: stable@vger.kernel.org # 4.9+\n-Fixes: 80a83cfc434b1 (\"mac80211: skip netdev queue control with software queuing\")\n-Reported-and-tested-by: Sven Eckelmann \n-Signed-off-by: Johannes Berg \n----\n-\n---- a/net/mac80211/iface.c\n-+++ b/net/mac80211/iface.c\n-@@ -727,7 +727,8 @@ int ieee80211_do_open(struct wireless_de\n- \tieee80211_recalc_ps(local);\n- \n- \tif (sdata->vif.type == NL80211_IFTYPE_MONITOR ||\n--\t sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {\n-+\t sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||\n-+\t local->ops->wake_tx_queue) {\n- \t\t/* XXX: for AP_VLAN, actually track AP queues */\n- \t\tnetif_tx_start_all_queues(dev);\n- \t} else if (dev) {\ndiff --git a/package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch b/package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch\ndeleted file mode 100644\nindex 60de2b6d14..0000000000\n--- a/package/kernel/mac80211/patches/326-ath9k-fix-ar934x-OTP-offsets.patch\n+++ /dev/null\n@@ -1,42 +0,0 @@\n-From: Christian Lamparter \n-Date: Tue, 14 Feb 2017 20:10:30 +0100\n-Subject: ath9k: use correct OTP register offsets for the AR9340 and AR9550\n-\n-This patch fixes the OTP register definitions for the AR934x and AR9550\n-WMAC SoC.\n-\n-Previously, the ath9k driver was unable to initialize the integrated\n-WMAC on an Aerohive AP121:\n-\n-| ath: phy0: timeout (1000 us) on reg 0x30018: 0xbadc0ffe & 0x00000007 != 0x00000004\n-| ath: phy0: timeout (1000 us) on reg 0x30018: 0xbadc0ffe & 0x00000007 != 0x00000004\n-| ath: phy0: Unable to initialize hardware; initialization status: -5\n-| ath9k ar934x_wmac: failed to initialize device\n-| ath9k: probe of ar934x_wmac failed with error -5\n-\n-It turns out that the AR9300_OTP_STATUS and AR9300_OTP_DATA\n-definitions contain a typo.\n-\n-Fixes: add295a4afbdf5852d0 \"ath9k: use correct OTP register offsets for AR9550\"\n-Signed-off-by: Christian Lamparter \n-Signed-off-by: Chris Blake \n----\n-\n---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h\n-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h\n-@@ -75,13 +75,13 @@\n- #define AR9300_OTP_BASE \\\n- \t\t((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30000 : 0x14000)\n- #define AR9300_OTP_STATUS \\\n--\t\t((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30018 : 0x15f18)\n-+\t\t((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x31018 : 0x15f18)\n- #define AR9300_OTP_STATUS_TYPE\t\t0x7\n- #define AR9300_OTP_STATUS_VALID\t\t0x4\n- #define AR9300_OTP_STATUS_ACCESS_BUSY\t0x2\n- #define AR9300_OTP_STATUS_SM_BUSY\t0x1\n- #define AR9300_OTP_READ_DATA \\\n--\t\t((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3001c : 0x15f1c)\n-+\t\t((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3101c : 0x15f1c)\n- \n- enum targetPowerHTRates {\n- \tHT_TARGET_RATE_0_8_16,\ndiff --git a/package/kernel/mac80211/patches/327-ath10k-increase-BMI-timeout.patch b/package/kernel/mac80211/patches/327-ath10k-increase-BMI-timeout.patch\ndeleted file mode 100644\nindex c9f493bcd8..0000000000\n--- a/package/kernel/mac80211/patches/327-ath10k-increase-BMI-timeout.patch\n+++ /dev/null\n@@ -1,31 +0,0 @@\n-From: Ben Greear \n-Date: Wed, 31 May 2017 14:21:19 +0300\n-Subject: [PATCH] ath10k: increase BMI timeout\n-\n-When testing a 9888 chipset NIC, I notice it often takes\n-almost 2 seconds, and then many times OTP fails, probably due\n-to the two-second timeout.\n-\n-[ 2269.841842] ath10k_pci 0000:05:00.0: bmi cmd took: 1984 jiffies (HZ: 1000), rv: 0\n-[ 2273.608185] ath10k_pci 0000:05:00.0: bmi cmd took: 1986 jiffies (HZ: 1000), rv: 0\n-[ 2277.294732] ath10k_pci 0000:05:00.0: bmi cmd took: 1989 jiffies (HZ: 1000), rv: 0\n-\n-So, increase the BMI timeout to 3 seconds.\n-\n-Signed-off-by: Ben Greear \n-Signed-off-by: Kalle Valo \n----\n-\n---- a/drivers/net/wireless/ath/ath10k/bmi.h\n-+++ b/drivers/net/wireless/ath/ath10k/bmi.h\n-@@ -187,8 +187,8 @@ struct bmi_target_info {\n- \tu32 type;\n- };\n- \n--/* in msec */\n--#define BMI_COMMUNICATION_TIMEOUT_HZ (2 * HZ)\n-+/* in jiffies */\n-+#define BMI_COMMUNICATION_TIMEOUT_HZ (3 * HZ)\n- \n- #define BMI_CE_NUM_TO_TARG 0\n- #define BMI_CE_NUM_TO_HOST 1\ndiff --git a/package/kernel/mac80211/patches/328-ath10k-log-when-longer-bmi-cmds-happen.patch b/package/kernel/mac80211/patches/328-ath10k-log-when-longer-bmi-cmds-happen.patch\ndeleted file mode 100644\nindex 500f72ff98..0000000000\n--- a/package/kernel/mac80211/patches/328-ath10k-log-when-longer-bmi-cmds-happen.patch\n+++ /dev/null\n@@ -1,74 +0,0 @@\n-From: Ben Greear \n-Date: Wed, 31 May 2017 14:21:21 +0300\n-Subject: [PATCH] ath10k: log when longer bmi cmds happen\n-\n-This lets one have a clue that maybe timeouts are happening\n-when we just aren't waiting long enough.\n-\n-Signed-off-by: Ben Greear \n-Signed-off-by: Kalle Valo \n----\n-\n---- a/drivers/net/wireless/ath/ath10k/pci.c\n-+++ b/drivers/net/wireless/ath/ath10k/pci.c\n-@@ -101,7 +101,8 @@ static int ath10k_pci_init_irq(struct at\n- static int ath10k_pci_deinit_irq(struct ath10k *ar);\n- static int ath10k_pci_request_irq(struct ath10k *ar);\n- static void ath10k_pci_free_irq(struct ath10k *ar);\n--static int ath10k_pci_bmi_wait(struct ath10k_ce_pipe *tx_pipe,\n-+static int ath10k_pci_bmi_wait(struct ath10k *ar,\n-+\t\t\t struct ath10k_ce_pipe *tx_pipe,\n- \t\t\t struct ath10k_ce_pipe *rx_pipe,\n- \t\t\t struct bmi_xfer *xfer);\n- static int ath10k_pci_qca99x0_chip_reset(struct ath10k *ar);\n-@@ -1843,7 +1844,7 @@ int ath10k_pci_hif_exchange_bmi_msg(stru\n- \tif (ret)\n- \t\tgoto err_resp;\n- \n--\tret = ath10k_pci_bmi_wait(ce_tx, ce_rx, &xfer);\n-+\tret = ath10k_pci_bmi_wait(ar, ce_tx, ce_rx, &xfer);\n- \tif (ret) {\n- \t\tu32 unused_buffer;\n- \t\tunsigned int unused_nbytes;\n-@@ -1910,23 +1911,37 @@ static void ath10k_pci_bmi_recv_data(str\n- \txfer->rx_done = true;\n- }\n- \n--static int ath10k_pci_bmi_wait(struct ath10k_ce_pipe *tx_pipe,\n-+static int ath10k_pci_bmi_wait(struct ath10k *ar,\n-+\t\t\t struct ath10k_ce_pipe *tx_pipe,\n- \t\t\t struct ath10k_ce_pipe *rx_pipe,\n- \t\t\t struct bmi_xfer *xfer)\n- {\n- \tunsigned long timeout = jiffies + BMI_COMMUNICATION_TIMEOUT_HZ;\n-+\tunsigned long started = jiffies;\n-+\tunsigned long dur;\n-+\tint ret;\n- \n- \twhile (time_before_eq(jiffies, timeout)) {\n- \t\tath10k_pci_bmi_send_done(tx_pipe);\n- \t\tath10k_pci_bmi_recv_data(rx_pipe);\n- \n--\t\tif (xfer->tx_done && (xfer->rx_done == xfer->wait_for_resp))\n--\t\t\treturn 0;\n-+\t\tif (xfer->tx_done && (xfer->rx_done == xfer->wait_for_resp)) {\n-+\t\t\tret = 0;\n-+\t\t\tgoto out;\n-+\t\t}\n- \n- \t\tschedule();\n- \t}\n- \n--\treturn -ETIMEDOUT;\n-+\tret = -ETIMEDOUT;\n-+\n-+out:\n-+\tdur = jiffies - started;\n-+\tif (dur > HZ)\n-+\t\tath10k_dbg(ar, ATH10K_DBG_BMI,\n-+\t\t\t \"bmi cmd took %lu jiffies hz %d ret %d\\n\",\n-+\t\t\t dur, HZ, ret);\n-+\treturn ret;\n- }\n- \n- /*\ndiff --git a/package/kernel/mac80211/patches/329-ath10k-add-BMI-parameters-to-fix-calibration-from-DT.patch b/package/kernel/mac80211/patches/329-ath10k-add-BMI-parameters-to-fix-calibration-from-DT.patch\ndeleted file mode 100644\nindex 3fcf505e15..0000000000\n--- a/package/kernel/mac80211/patches/329-ath10k-add-BMI-parameters-to-fix-calibration-from-DT.patch\n+++ /dev/null\n@@ -1,80 +0,0 @@\n-From: Anilkumar Kolli \n-Date: Wed, 31 May 2017 14:21:27 +0300\n-Subject: [PATCH] ath10k: add BMI parameters to fix calibration from\n- DT/pre-cal\n-\n-QCA99X0, QCA9888, QCA9984 supports calibration data in\n-either OTP or DT/pre-cal file. Current ath10k supports\n-Calibration data from OTP only.\n-\n-If caldata is loaded from DT/pre-cal file, fetching board id\n-and applying calibration parameters like tx power gets failed.\n-\n-error log:\n-[ 15.733663] ath10k_pci 0000:01:00.0: failed to fetch board file: -2\n-[ 15.741474] ath10k_pci 0000:01:00.0: could not probe fw (-2)\n-\n-This patch adds calibration data support from DT/pre-cal\n-file. Below parameters are used to get board id and\n-applying calibration parameters from cal data.\n-\n-\t\tEEPROM[OTP]\tFLASH[DT/pre-cal file]\n-Cal param\t0x700\t\t0x10000\n-Board id\t0x10\t\t0x8000\n-\n-Tested on QCA9888 with pre-cal file.\n-\n-Signed-off-by: Anilkumar Kolli \n-Signed-off-by: Kalle Valo \n----\n-\n---- a/drivers/net/wireless/ath/ath10k/bmi.h\n-+++ b/drivers/net/wireless/ath/ath10k/bmi.h\n-@@ -83,6 +83,8 @@ enum bmi_cmd_id {\n- #define BMI_NVRAM_SEG_NAME_SZ 16\n- \n- #define BMI_PARAM_GET_EEPROM_BOARD_ID 0x10\n-+#define BMI_PARAM_GET_FLASH_BOARD_ID 0x8000\n-+#define BMI_PARAM_FLASH_SECTION_ALL 0x10000\n- \n- #define ATH10K_BMI_BOARD_ID_FROM_OTP_MASK 0x7c00\n- #define ATH10K_BMI_BOARD_ID_FROM_OTP_LSB 10\n---- a/drivers/net/wireless/ath/ath10k/core.c\n-+++ b/drivers/net/wireless/ath/ath10k/core.c\n-@@ -657,7 +657,7 @@ static int ath10k_core_get_board_id_from\n- {\n- \tu32 result, address;\n- \tu8 board_id, chip_id;\n--\tint ret;\n-+\tint ret, bmi_board_id_param;\n- \n- \taddress = ar->hw_params.patch_load_addr;\n- \n-@@ -681,8 +681,13 @@ static int ath10k_core_get_board_id_from\n- \t\treturn ret;\n- \t}\n- \n--\tret = ath10k_bmi_execute(ar, address, BMI_PARAM_GET_EEPROM_BOARD_ID,\n--\t\t\t\t &result);\n-+\tif (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||\n-+\t ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE)\n-+\t\tbmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID;\n-+\telse\n-+\t\tbmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID;\n-+\n-+\tret = ath10k_bmi_execute(ar, address, bmi_board_id_param, &result);\n- \tif (ret) {\n- \t\tath10k_err(ar, \"could not execute otp for board id check: %d\\n\",\n- \t\t\t ret);\n-@@ -810,6 +815,11 @@ static int ath10k_download_and_run_otp(s\n- \t\treturn ret;\n- \t}\n- \n-+\t/* As of now pre-cal is valid for 10_4 variants */\n-+\tif (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||\n-+\t ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE)\n-+\t\tbmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL;\n-+\n- \tret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result);\n- \tif (ret) {\n- \t\tath10k_err(ar, \"could not execute otp (%d)\\n\", ret);\ndiff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch\nindex c8ede7f583..44c84af80d 100644\n--- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch\n+++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch\n@@ -27,7 +27,7 @@\n \tif (!IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_REG_HINTS))\n \t\treturn false;\n \tif (!dynamic_country_user_possible(reg))\n-@@ -341,6 +347,9 @@ ath_reg_apply_beaconing_flags(struct wip\n+@@ -345,6 +351,9 @@ ath_reg_apply_beaconing_flags(struct wip\n \tstruct ieee80211_channel *ch;\n \tunsigned int i;\n \n@@ -37,7 +37,7 @@\n \tfor (band = 0; band < NUM_NL80211_BANDS; band++) {\n \t\tif (!wiphy->bands[band])\n \t\t\tcontinue;\n-@@ -374,6 +383,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip\n+@@ -378,6 +387,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip\n {\n \tstruct ieee80211_supported_band *sband;\n \n@@ -47,7 +47,7 @@\n \tsband = wiphy->bands[NL80211_BAND_2GHZ];\n \tif (!sband)\n \t\treturn;\n-@@ -402,6 +414,9 @@ static void ath_reg_apply_radar_flags(st\n+@@ -407,6 +419,9 @@ static void ath_reg_apply_radar_flags(st\n \tstruct ieee80211_channel *ch;\n \tunsigned int i;\n \n@@ -57,7 +57,7 @@\n \tif (!wiphy->bands[NL80211_BAND_5GHZ])\n \t\treturn;\n \n-@@ -539,6 +554,11 @@ void ath_reg_notifier_apply(struct wiphy\n+@@ -544,6 +559,11 @@ void ath_reg_notifier_apply(struct wiphy\n \t\tath_reg_dyn_country(wiphy, reg, request);\n \t\tbreak;\n \t}\n@@ -69,7 +69,7 @@\n }\n EXPORT_SYMBOL(ath_reg_notifier_apply);\n \n-@@ -634,6 +654,10 @@ ath_regd_init_wiphy(struct ath_regulator\n+@@ -639,6 +659,10 @@ ath_regd_init_wiphy(struct ath_regulator\n \tconst struct ieee80211_regdomain *regd;\n \n \twiphy->reg_notifier = reg_notifier;\n@@ -80,7 +80,7 @@\n \twiphy->regulatory_flags |= REGULATORY_STRICT_REG |\n \t\t\t\t REGULATORY_CUSTOM_REG;\n \n-@@ -762,10 +786,7 @@ ath_regd_init(struct ath_regulatory *reg\n+@@ -767,10 +791,7 @@ ath_regd_init(struct ath_regulatory *reg\n \tif (r)\n \t\treturn r;\n \n@@ -104,9 +104,9 @@\n config ATH_DEBUG\n \tbool \"Atheros wireless debugging\"\n \t---help---\n---- a/.local-symbols\n-+++ b/.local-symbols\n-@@ -130,6 +130,7 @@ ADM8211=\n+--- a/local-symbols\n++++ b/local-symbols\n+@@ -81,6 +81,7 @@ ADM8211=\n ATH_COMMON=\n WLAN_VENDOR_ATH=\n ATH_DEBUG=\ndiff --git a/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch b/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch\nindex 469da90160..161ab0129e 100644\n--- a/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch\n+++ b/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch\n@@ -1,6 +1,6 @@\n --- a/net/wireless/reg.c\n +++ b/net/wireless/reg.c\n-@@ -2398,6 +2398,8 @@ void regulatory_hint_country_ie(struct w\n+@@ -2481,6 +2481,8 @@ void regulatory_hint_country_ie(struct w\n \tenum environment_cap env = ENVIRON_ANY;\n \tstruct regulatory_request *request = NULL, *lr;\n \n@@ -9,7 +9,7 @@\n \t/* IE len must be evenly divisible by 2 */\n \tif (country_ie_len & 0x01)\n \t\treturn;\n-@@ -2604,6 +2606,7 @@ static void restore_regulatory_settings(\n+@@ -2687,6 +2689,7 @@ static void restore_regulatory_settings(\n \n void regulatory_hint_disconnect(void)\n {\ndiff --git a/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch b/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch\nindex 35b0f2b76e..44e8f3281c 100644\n--- a/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch\n+++ b/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch\n@@ -39,7 +39,7 @@\n bool ath_is_world_regd(struct ath_regulatory *reg)\n {\n \treturn is_wwr_sku(ath_regd_get_eepromRD(reg));\n-@@ -658,6 +666,9 @@ ath_regd_init_wiphy(struct ath_regulator\n+@@ -663,6 +671,9 @@ ath_regd_init_wiphy(struct ath_regulator\n \tif (IS_ENABLED(CPTCFG_ATH_USER_REGD))\n \t\treturn 0;\n \ndiff --git a/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch b/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch\nindex 1d249a9723..3ae01a5c35 100644\n--- a/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch\n+++ b/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch\n@@ -109,7 +109,7 @@ drivers/net/wireless/ath/ath5k/debug.c | 86 ++++++++++++++++++++++++++++++++\n \n /* debugfs: queues etc */\n \n-@@ -1009,6 +1100,9 @@ ath5k_debug_init_device(struct ath5k_hw\n+@@ -1012,6 +1103,9 @@ ath5k_debug_init_device(struct ath5k_hw\n \tdebugfs_create_file(\"beacon\", S_IWUSR | S_IRUSR, phydir, ah,\n \t\t\t &fops_beacon);\n \ndiff --git a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch\nindex f21eed18c3..b6dc45cd96 100644\n--- a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch\n+++ b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath9k/debug.c\n +++ b/drivers/net/wireless/ath/ath9k/debug.c\n-@@ -1315,6 +1315,53 @@ void ath9k_deinit_debug(struct ath_softc\n+@@ -1374,6 +1374,53 @@ void ath9k_deinit_debug(struct ath_softc\n \tath9k_cmn_spectral_deinit_debug(&sc->spec_priv);\n }\n \n@@ -54,7 +54,7 @@\n int ath9k_init_debug(struct ath_hw *ah)\n {\n \tstruct ath_common *common = ath9k_hw_common(ah);\n-@@ -1334,6 +1381,8 @@ int ath9k_init_debug(struct ath_hw *ah)\n+@@ -1393,6 +1440,8 @@ int ath9k_init_debug(struct ath_hw *ah)\n \tath9k_tx99_init_debug(sc);\n \tath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);\n \ndiff --git a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch\nindex d076e3c2eb..53225dbc36 100644\n--- a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch\n+++ b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath9k/init.c\n +++ b/drivers/net/wireless/ath/ath9k/init.c\n-@@ -1086,23 +1086,23 @@ static int __init ath9k_init(void)\n+@@ -1088,23 +1088,23 @@ static int __init ath9k_init(void)\n {\n \tint error;\n \ndiff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch\nindex c98072bac9..2ebb73d689 100644\n--- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch\n+++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath9k/debug.c\n +++ b/drivers/net/wireless/ath/ath9k/debug.c\n-@@ -1362,6 +1362,52 @@ static const struct file_operations fops\n+@@ -1421,6 +1421,52 @@ static const struct file_operations fops\n \t.owner = THIS_MODULE\n };\n \n@@ -53,7 +53,7 @@\n int ath9k_init_debug(struct ath_hw *ah)\n {\n \tstruct ath_common *common = ath9k_hw_common(ah);\n-@@ -1383,6 +1429,8 @@ int ath9k_init_debug(struct ath_hw *ah)\n+@@ -1442,6 +1488,8 @@ int ath9k_init_debug(struct ath_hw *ah)\n \n \tdebugfs_create_file(\"eeprom\", S_IRUSR, sc->debug.debugfs_phy, sc,\n \t\t\t &fops_eeprom);\n@@ -74,7 +74,7 @@\n \n --- a/drivers/net/wireless/ath/ath9k/common.c\n +++ b/drivers/net/wireless/ath/ath9k/common.c\n-@@ -296,11 +296,13 @@ EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_ke\n+@@ -297,11 +297,13 @@ EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_ke\n /*\n * Update internal channel flags.\n */\n@@ -89,7 +89,7 @@\n \n \tichan->channel = chan->center_freq;\n \tichan->chan = chan;\n-@@ -308,7 +310,19 @@ static void ath9k_cmn_update_ichannel(st\n+@@ -309,7 +311,19 @@ static void ath9k_cmn_update_ichannel(st\n \tif (chan->band == NL80211_BAND_5GHZ)\n \t\tflags |= CHANNEL_5GHZ;\n \n@@ -110,7 +110,7 @@\n \tcase NL80211_CHAN_WIDTH_5:\n \t\tflags |= CHANNEL_QUARTER;\n \t\tbreak;\n-@@ -341,10 +355,11 @@ struct ath9k_channel *ath9k_cmn_get_chan\n+@@ -342,10 +356,11 @@ struct ath9k_channel *ath9k_cmn_get_chan\n \t\t\t\t\t struct cfg80211_chan_def *chandef)\n {\n \tstruct ieee80211_channel *curchan = chandef->chan;\ndiff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch\nindex 59daf4fe11..9391cfda52 100644\n--- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch\n+++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch\n@@ -20,7 +20,7 @@\n #define AR9160_DEVID_PCI\t0x0027\n --- a/drivers/net/wireless/ath/ath9k/pci.c\n +++ b/drivers/net/wireless/ath/ath9k/pci.c\n-@@ -763,6 +763,7 @@ static const struct pci_device_id ath_pc\n+@@ -768,6 +768,7 @@ static const struct pci_device_id ath_pc\n \t .driver_data = ATH9K_PCI_BT_ANT_DIV },\n #endif\n \ndiff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch\nindex 9a0f6f5dbd..0810bf2d65 100644\n--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch\n+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch\n@@ -1,6 +1,6 @@\n --- a/include/net/cfg80211.h\n +++ b/include/net/cfg80211.h\n-@@ -2660,6 +2660,7 @@ struct cfg80211_nan_func {\n+@@ -2750,6 +2750,7 @@ struct cfg80211_pmk_conf {\n *\t(as advertised by the nl80211 feature flag.)\n * @get_tx_power: store the current TX power into the dbm variable;\n *\treturn 0 if successful\n@@ -8,7 +8,7 @@\n *\n * @set_wds_peer: set the WDS peer for a WDS interface\n *\n-@@ -2940,6 +2941,7 @@ struct cfg80211_ops {\n+@@ -3041,6 +3042,7 @@ struct cfg80211_ops {\n \t\t\t\tenum nl80211_tx_power_setting type, int mbm);\n \tint\t(*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,\n \t\t\t\tint *dbm);\n@@ -18,7 +18,7 @@\n \t\t\t\tconst u8 *addr);\n --- a/include/net/mac80211.h\n +++ b/include/net/mac80211.h\n-@@ -1325,6 +1325,7 @@ enum ieee80211_smps_mode {\n+@@ -1349,6 +1349,7 @@ enum ieee80211_smps_mode {\n *\n * @power_level: requested transmit power (in dBm), backward compatibility\n *\tvalue only that is set to the minimum of all interfaces\n@@ -26,7 +26,7 @@\n *\n * @chandef: the channel definition to tune to\n * @radar_enabled: whether radar detection is enabled\n-@@ -1345,6 +1346,7 @@ enum ieee80211_smps_mode {\n+@@ -1369,6 +1370,7 @@ enum ieee80211_smps_mode {\n struct ieee80211_conf {\n \tu32 flags;\n \tint power_level, dynamic_ps_timeout;\n@@ -36,9 +36,9 @@\n \tu8 ps_dtim_period;\n --- a/include/uapi/linux/nl80211.h\n +++ b/include/uapi/linux/nl80211.h\n-@@ -2002,6 +2002,9 @@ enum nl80211_commands {\n- *\tu32 attribute with an &enum nl80211_timeout_reason value. This is used,\n- *\te.g., with %NL80211_CMD_CONNECT event.\n+@@ -2139,6 +2139,9 @@ enum nl80211_commands {\n+ *\tthe driver or is not needed (because roaming used the Fast Transition\n+ *\tprotocol).\n *\n + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce\n + *\ttransmit power to stay within regulatory limits. u32, dBi.\n@@ -46,9 +46,9 @@\n * @NUM_NL80211_ATTR: total number of nl80211_attrs available\n * @NL80211_ATTR_MAX: highest attribute number currently defined\n * @__NL80211_ATTR_AFTER_LAST: internal use\n-@@ -2413,6 +2416,8 @@ enum nl80211_attrs {\n- \n- \tNL80211_ATTR_TIMEOUT_REASON,\n+@@ -2565,6 +2568,8 @@ enum nl80211_attrs {\n+ \tNL80211_ATTR_PMKR0_NAME,\n+ \tNL80211_ATTR_PORT_AUTHORIZED,\n \n +\tNL80211_ATTR_WIPHY_ANTENNA_GAIN,\n +\n@@ -57,7 +57,7 @@\n \t__NL80211_ATTR_AFTER_LAST,\n --- a/net/mac80211/cfg.c\n +++ b/net/mac80211/cfg.c\n-@@ -2396,6 +2396,19 @@ static int ieee80211_get_tx_power(struct\n+@@ -2444,6 +2444,19 @@ static int ieee80211_get_tx_power(struct\n \treturn 0;\n }\n \n@@ -77,7 +77,7 @@\n static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,\n \t\t\t\t const u8 *addr)\n {\n-@@ -3627,6 +3640,7 @@ const struct cfg80211_ops mac80211_confi\n+@@ -3717,6 +3730,7 @@ const struct cfg80211_ops mac80211_confi\n \t.set_wiphy_params = ieee80211_set_wiphy_params,\n \t.set_tx_power = ieee80211_set_tx_power,\n \t.get_tx_power = ieee80211_get_tx_power,\n@@ -87,7 +87,7 @@\n \tCFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)\n --- a/net/mac80211/ieee80211_i.h\n +++ b/net/mac80211/ieee80211_i.h\n-@@ -1370,6 +1370,7 @@ struct ieee80211_local {\n+@@ -1347,6 +1347,7 @@ struct ieee80211_local {\n \tint dynamic_ps_forced_timeout;\n \n \tint user_power_level; /* in dBm, for all interfaces */\n@@ -119,7 +119,7 @@\n \tif (local->hw.conf.power_level != power) {\n \t\tchanged |= IEEE80211_CONF_CHANGE_POWER;\n \t\tlocal->hw.conf.power_level = power;\n-@@ -589,6 +595,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_\n+@@ -592,6 +598,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_\n \t\t\t\t\t IEEE80211_RADIOTAP_MCS_HAVE_BW;\n \tlocal->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |\n \t\t\t\t\t IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;\n@@ -129,15 +129,15 @@\n \tlocal->user_power_level = IEEE80211_UNSET_POWER_LEVEL;\n --- a/net/wireless/nl80211.c\n +++ b/net/wireless/nl80211.c\n-@@ -424,6 +424,7 @@ static const struct nla_policy nl80211_p\n- \t\t.len = sizeof(struct nl80211_bss_select_rssi_adjust)\n- \t},\n- \t[NL80211_ATTR_TIMEOUT_REASON] = { .type = NLA_U32 },\n+@@ -420,6 +420,7 @@ static const struct nla_policy nl80211_p\n+ \t[NL80211_ATTR_FILS_CACHE_ID] = { .len = 2 },\n+ \t[NL80211_ATTR_PMK] = { .type = NLA_BINARY, .len = PMK_MAX_LEN },\n+ \t[NL80211_ATTR_SCHED_SCAN_MULTI] = { .type = NLA_FLAG },\n +\t[NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },\n };\n \n /* policy for the key attributes */\n-@@ -2385,6 +2386,20 @@ static int nl80211_set_wiphy(struct sk_b\n+@@ -2378,6 +2379,20 @@ static int nl80211_set_wiphy(struct sk_b\n \t\tif (result)\n \t\t\treturn result;\n \t}\ndiff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch\nindex b3b51b4433..8ea2f79a20 100644\n--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch\n+++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch\n@@ -181,7 +181,7 @@\n \n --- a/drivers/net/wireless/ath/ath9k/init.c\n +++ b/drivers/net/wireless/ath/ath9k/init.c\n-@@ -998,7 +998,7 @@ int ath9k_init_device(u16 devid, struct\n+@@ -1000,7 +1000,7 @@ int ath9k_init_device(u16 devid, struct\n \n #ifdef CPTCFG_MAC80211_LEDS\n \t/* must be initialized before ieee80211_register_hw */\n@@ -192,7 +192,7 @@\n #endif\n --- a/drivers/net/wireless/ath/ath9k/debug.c\n +++ b/drivers/net/wireless/ath/ath9k/debug.c\n-@@ -1407,6 +1407,61 @@ static const struct file_operations fops\n+@@ -1466,6 +1466,61 @@ static const struct file_operations fops\n \t.llseek = default_llseek,\n };\n \n@@ -254,7 +254,7 @@\n \n int ath9k_init_debug(struct ath_hw *ah)\n {\n-@@ -1431,6 +1486,10 @@ int ath9k_init_debug(struct ath_hw *ah)\n+@@ -1490,6 +1545,10 @@ int ath9k_init_debug(struct ath_hw *ah)\n \t\t\t &fops_eeprom);\n \tdebugfs_create_file(\"chanbw\", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,\n \t\t\t sc, &fops_chanbw);\ndiff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch\nindex 3e687792da..7cf589485e 100644\n--- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch\n+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath9k/debug.c\n +++ b/drivers/net/wireless/ath/ath9k/debug.c\n-@@ -1463,6 +1463,50 @@ static const struct file_operations fops\n+@@ -1522,6 +1522,50 @@ static const struct file_operations fops\n #endif\n \n \n@@ -51,7 +51,7 @@\n int ath9k_init_debug(struct ath_hw *ah)\n {\n \tstruct ath_common *common = ath9k_hw_common(ah);\n-@@ -1490,6 +1534,8 @@ int ath9k_init_debug(struct ath_hw *ah)\n+@@ -1549,6 +1593,8 @@ int ath9k_init_debug(struct ath_hw *ah)\n \tdebugfs_create_file(\"gpio_led\", S_IWUSR,\n \t\t\t sc->debug.debugfs_phy, sc, &fops_gpio_led);\n #endif\n@@ -75,16 +75,16 @@\n struct ath9k_hw_version {\n \tu32 magic;\n \tu16 devid;\n-@@ -805,6 +811,8 @@ struct ath_hw {\n- \tu32 rfkill_polarity;\n+@@ -806,6 +812,8 @@ struct ath_hw {\n \tu32 ah_flags;\n+ \ts16 nf_override;\n \n +\tunsigned long diag;\n +\n \tbool reset_power_on;\n \tbool htc_reset_init;\n \n-@@ -1067,6 +1075,7 @@ void ath9k_hw_check_nav(struct ath_hw *a\n+@@ -1068,6 +1076,7 @@ void ath9k_hw_check_nav(struct ath_hw *a\n bool ath9k_hw_check_alive(struct ath_hw *ah);\n \n bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);\ndiff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch\nindex 6f7370203b..f9d3251c22 100644\n--- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch\n+++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch\n@@ -18,7 +18,7 @@\n \tvoid (*spectral_scan_trigger)(struct ath_hw *ah);\n --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c\n +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c\n-@@ -1947,6 +1947,26 @@ void ar9003_hw_init_rate_txpower(struct\n+@@ -1945,6 +1945,26 @@ void ar9003_hw_init_rate_txpower(struct\n \t}\n }\n \n@@ -45,7 +45,7 @@\n void ar9003_hw_attach_phy_ops(struct ath_hw *ah)\n {\n \tstruct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);\n-@@ -1983,6 +2003,7 @@ void ar9003_hw_attach_phy_ops(struct ath\n+@@ -1981,6 +2001,7 @@ void ar9003_hw_attach_phy_ops(struct ath\n \tpriv_ops->set_radar_params = ar9003_hw_set_radar_params;\n \tpriv_ops->fast_chan_change = ar9003_hw_fast_chan_change;\n \n@@ -65,8 +65,8 @@\n }\n \n static const struct ieee80211_iface_limit if_limits[] = {\n-@@ -958,6 +959,18 @@ static void ath9k_set_hw_capab(struct at\n- \tSET_IEEE80211_PERM_ADDR(hw, common->macaddr);\n+@@ -960,6 +961,18 @@ static void ath9k_set_hw_capab(struct at\n+ \twiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);\n }\n \n +static void ath_get_initial_entropy(struct ath_softc *sc)\n@@ -84,7 +84,7 @@\n int ath9k_init_device(u16 devid, struct ath_softc *sc,\n \t\t const struct ath_bus_ops *bus_ops)\n {\n-@@ -1003,6 +1016,8 @@ int ath9k_init_device(u16 devid, struct\n+@@ -1005,6 +1018,8 @@ int ath9k_init_device(u16 devid, struct\n \t\tARRAY_SIZE(ath9k_tpt_blink));\n #endif\n \ndiff --git a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch\nindex bcb0026a69..c0238bcec1 100644\n--- a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch\n+++ b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch\n@@ -384,9 +384,9 @@\n };\n \n #endif /* _LINUX_ATH9K_PLATFORM_H */\n---- a/.local-symbols\n-+++ b/.local-symbols\n-@@ -157,6 +157,7 @@ ATH9K_WOW=\n+--- a/local-symbols\n++++ b/local-symbols\n+@@ -108,6 +108,7 @@ ATH9K_WOW=\n ATH9K_RFKILL=\n ATH9K_CHANNEL_CONTEXT=\n ATH9K_PCOEM=\ndiff --git a/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch b/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch\nindex dc0f19490e..4b86990675 100644\n--- a/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch\n+++ b/package/kernel/mac80211/patches/600-02-rt2x00-rt2800lib-enable-support-for-RT3883.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -9397,6 +9397,7 @@ static int rt2800_probe_rt(struct rt2x00\n+@@ -9400,6 +9400,7 @@ static int rt2800_probe_rt(struct rt2x00\n \tcase RT3390:\n \tcase RT3572:\n \tcase RT3593:\ndiff --git a/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch b/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch\nindex 45fc964504..b70df04514 100644\n--- a/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch\n+++ b/package/kernel/mac80211/patches/600-03-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch\n@@ -31,7 +31,7 @@ Signed-off-by: Gabor Juhos \n #define RF5362\t\t\t\t0x5362\n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -8975,6 +8975,66 @@ static const struct rf_channel rf_vals_3\n+@@ -8978,6 +8978,66 @@ static const struct rf_channel rf_vals_3\n \t{14, 0xF0,\t 2, 0x18},\n };\n \n@@ -98,7 +98,7 @@ Signed-off-by: Gabor Juhos \n static const struct rf_channel rf_vals_5592_xtal20[] = {\n \t/* Channel, N, K, mod, R */\n \t{1, 482, 4, 10, 3},\n-@@ -9238,6 +9298,11 @@ static int rt2800_probe_hw_mode(struct r\n+@@ -9241,6 +9301,11 @@ static int rt2800_probe_hw_mode(struct r\n \t\tspec->channels = rf_vals_3x;\n \t\tbreak;\n \n@@ -108,5 +108,5 @@ Signed-off-by: Gabor Juhos \n +\t\tbreak;\n +\n \tcase RF5592:\n- \t\trt2800_register_read(rt2x00dev, MAC_DEBUG_INDEX, ®);\n+ \t\treg = rt2800_register_read(rt2x00dev, MAC_DEBUG_INDEX);\n \t\tif (rt2x00_get_field32(reg, MAC_DEBUG_INDEX_XTAL)) {\ndiff --git a/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch b/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch\nindex fb32b75d0a..ed6eddb04a 100644\n--- a/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch\n+++ b/package/kernel/mac80211/patches/600-04-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -4871,6 +4871,7 @@ void rt2800_vco_calibration(struct rt2x0\n+@@ -4878,6 +4878,7 @@ void rt2800_vco_calibration(struct rt2x0\n \tcase RF3053:\n \tcase RF3070:\n \tcase RF3290:\n@@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos \n \tcase RF5350:\n \tcase RF5360:\n \tcase RF5362:\n-@@ -9420,6 +9421,7 @@ static int rt2800_probe_hw_mode(struct r\n+@@ -9423,6 +9424,7 @@ static int rt2800_probe_hw_mode(struct r\n \tcase RF3053:\n \tcase RF3070:\n \tcase RF3290:\ndiff --git a/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch b/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch\nindex 266a3fba50..1d6e312037 100644\n--- a/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch\n+++ b/package/kernel/mac80211/patches/600-05-rt2x00-rt2800lib-add-channel-configuration-function-.patch\n@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -2709,6 +2709,211 @@ static void rt2800_config_channel_rf3053\n+@@ -2713,6 +2713,211 @@ static void rt2800_config_channel_rf3053\n \t}\n }\n \n@@ -50,7 +50,7 @@ Signed-off-by: Gabor Juhos \n +\n +\trt2800_rfcsr_write(rt2x00dev, 13, 0x12);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 1);\n +\trt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 0);\n +\trt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 0);\n +\trt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 0);\n@@ -87,7 +87,7 @@ Signed-off-by: Gabor Juhos \n +\n +\trt2800_freq_cal_mode1(rt2x00dev);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 30);\n +\tif (!conf_is_ht40(conf))\n +\t\trfcsr &= ~(0x06);\n +\telse\n@@ -110,7 +110,7 @@ Signed-off-by: Gabor Juhos \n +\t\trt2800_rfcsr_write(rt2x00dev, 34, 0x20);\n +\n +\t/* loopback RF_BS */\n-+\trt2800_rfcsr_read(rt2x00dev, 36, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 36);\n +\tif (rf->channel <= 14)\n +\t\trt2x00_set_field8(&rfcsr, RFCSR36_RF_BS, 1);\n +\telse\n@@ -158,13 +158,13 @@ Signed-off-by: Gabor Juhos \n +\n +\trt2800_rfcsr_write(rt2x00dev, 50, 0x86);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 51, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 51);\n +\tif (rf->channel <= 14)\n +\t\trt2800_rfcsr_write(rt2x00dev, 51, 0x75);\n +\telse\n +\t\trt2800_rfcsr_write(rt2x00dev, 51, 0x51);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 52, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 52);\n +\tif (rf->channel <= 14)\n +\t\trt2800_rfcsr_write(rt2x00dev, 52, 0x45);\n +\telse\n@@ -194,25 +194,25 @@ Signed-off-by: Gabor Juhos \n +\t ((info->default_power2 & 0xe0) >> 1);\n +\trt2800_bbp_write(rt2x00dev, 109, bbp);\n +\n-+\trt2800_bbp_read(rt2x00dev, 110, &bbp);\n++\tbbp = rt2800_bbp_read(rt2x00dev, 110);\n +\tbbp &= 0x0f;\n +\tbbp |= (info->default_power3 & 0xe0) >> 1;\n +\trt2800_bbp_write(rt2x00dev, 110, bbp);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 57, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 57);\n +\tif (rf->channel <= 14)\n +\t\trt2800_rfcsr_write(rt2x00dev, 57, 0x6e);\n +\telse\n +\t\trt2800_rfcsr_write(rt2x00dev, 57, 0x3e);\n +\n +\t/* Enable RF tuning */\n-+\trt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 3);\n +\trt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);\n +\trt2800_rfcsr_write(rt2x00dev, 3, rfcsr);\n +\n +\tudelay(2000);\n +\n-+\trt2800_bbp_read(rt2x00dev, 49, &bbp);\n++\tbbp = rt2800_bbp_read(rt2x00dev, 49);\n +\t/* clear update flag */\n +\trt2800_bbp_write(rt2x00dev, 49, bbp & 0xfe);\n +\trt2800_bbp_write(rt2x00dev, 49, bbp);\n@@ -223,7 +223,7 @@ Signed-off-by: Gabor Juhos \n #define POWER_BOUND\t\t0x27\n #define POWER_BOUND_5G\t\t0x2b\n \n-@@ -3567,6 +3772,9 @@ static void rt2800_config_channel(struct\n+@@ -3570,6 +3775,9 @@ static void rt2800_config_channel(struct\n \tcase RF3322:\n \t\trt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);\n \t\tbreak;\ndiff --git a/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch b/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch\nindex 53e6bbb155..57183344f1 100644\n--- a/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch\n+++ b/package/kernel/mac80211/patches/600-06-rt2x00-rt2800lib-enable-RF3853-support.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -8900,6 +8900,7 @@ static int rt2800_init_eeprom(struct rt2\n+@@ -8903,6 +8903,7 @@ static int rt2800_init_eeprom(struct rt2\n \tcase RF3290:\n \tcase RF3320:\n \tcase RF3322:\ndiff --git a/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch b/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch\nindex cfa95e56bc..d0f80068a7 100644\n--- a/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch\n+++ b/package/kernel/mac80211/patches/600-07-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch\n@@ -35,7 +35,7 @@ Signed-off-by: Gabor Juhos \n #define RX_FILTER_CFG\t\t\t0x1400\n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -5501,6 +5501,12 @@ static int rt2800_init_registers(struct\n+@@ -5506,6 +5506,12 @@ static int rt2800_init_registers(struct\n \t\t\trt2800_register_write(rt2x00dev, TX_SW_CFG2,\n \t\t\t\t\t 0x00000000);\n \t\t}\n@@ -48,7 +48,7 @@ Signed-off-by: Gabor Juhos \n \t} else if (rt2x00_rt(rt2x00dev, RT5390) ||\n \t\t rt2x00_rt(rt2x00dev, RT5392) ||\n \t\t rt2x00_rt(rt2x00dev, RT6352)) {\n-@@ -5714,6 +5720,11 @@ static int rt2800_init_registers(struct\n+@@ -5719,6 +5725,11 @@ static int rt2800_init_registers(struct\n \treg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;\n \trt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);\n \n@@ -57,6 +57,6 @@ Signed-off-by: Gabor Juhos \n +\t\trt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_1, 0x16151413);\n +\t}\n +\n- \trt2800_register_read(rt2x00dev, TX_RTS_CFG, ®);\n+ \treg = rt2800_register_read(rt2x00dev, TX_RTS_CFG);\n \trt2x00_set_field32(®, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 7);\n \trt2x00_set_field32(®, TX_RTS_CFG_RTS_THRES,\ndiff --git a/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch b/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch\nindex 6adb9e1cd2..4e96ee3859 100644\n--- a/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch\n+++ b/package/kernel/mac80211/patches/600-09-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch\n@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -6341,6 +6341,47 @@ static void rt2800_init_bbp_3593(struct\n+@@ -6346,6 +6346,47 @@ static void rt2800_init_bbp_3593(struct\n \t\trt2800_bbp_write(rt2x00dev, 103, 0xc0);\n }\n \n@@ -59,7 +59,7 @@ Signed-off-by: Gabor Juhos \n static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev)\n {\n \tint ant, div_mode;\n-@@ -6785,6 +6826,9 @@ static void rt2800_init_bbp(struct rt2x0\n+@@ -6789,6 +6830,9 @@ static void rt2800_init_bbp(struct rt2x0\n \tcase RT3593:\n \t\trt2800_init_bbp_3593(rt2x00dev);\n \t\treturn;\ndiff --git a/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch b/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch\nindex aa3ead6ee8..a542c35327 100644\n--- a/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch\n+++ b/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch\n@@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos \n #define RFCSR2_TX2_EN_MT7620\t\tFIELD8(0x20)\n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -7701,6 +7701,144 @@ static void rt2800_init_rfcsr_5350(struc\n+@@ -7704,6 +7704,144 @@ static void rt2800_init_rfcsr_5350(struc\n \trt2800_rfcsr_write(rt2x00dev, 63, 0x00);\n }\n \n@@ -134,7 +134,7 @@ Signed-off-by: Gabor Juhos \n +\t\trt2800_rfcsr_write(rt2x00dev, 33, 0x32);\n +\t}\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 2);\n +\trt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_BP, 0);\n +\trt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);\n +\trt2800_rfcsr_write(rt2x00dev, 2, rfcsr);\n@@ -142,23 +142,23 @@ Signed-off-by: Gabor Juhos \n +\trt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 0);\n +\trt2800_rfcsr_write(rt2x00dev, 2, rfcsr);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 1);\n +\trt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);\n +\trt2800_rfcsr_write(rt2x00dev, 1, rfcsr);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 6);\n +\trfcsr |= 0xc0;\n +\trt2800_rfcsr_write(rt2x00dev, 6, rfcsr);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 22);\n +\trfcsr |= 0x20;\n +\trt2800_rfcsr_write(rt2x00dev, 22, rfcsr);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 46, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 46);\n +\trfcsr |= 0x20;\n +\trt2800_rfcsr_write(rt2x00dev, 46, rfcsr);\n +\n-+\trt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);\n++\trfcsr = rt2800_rfcsr_read(rt2x00dev, 20);\n +\trfcsr &= ~0xee;\n +\trt2800_rfcsr_write(rt2x00dev, 20, rfcsr);\n +}\n@@ -166,7 +166,7 @@ Signed-off-by: Gabor Juhos \n static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)\n {\n \trt2800_rf_init_calibration(rt2x00dev, 2);\n-@@ -8543,6 +8681,9 @@ static void rt2800_init_rfcsr(struct rt2\n+@@ -8546,6 +8684,9 @@ static void rt2800_init_rfcsr(struct rt2\n \tcase RT3390:\n \t\trt2800_init_rfcsr_3390(rt2x00dev);\n \t\tbreak;\ndiff --git a/package/kernel/mac80211/patches/600-11-rt2x00-rt2800lib-use-the-extended-EEPROM-map-for-RT3.patch b/package/kernel/mac80211/patches/600-11-rt2x00-rt2800lib-use-the-extended-EEPROM-map-for-RT3.patch\nindex 0e9496c056..e74f399e65 100644\n--- a/package/kernel/mac80211/patches/600-11-rt2x00-rt2800lib-use-the-extended-EEPROM-map-for-RT3.patch\n+++ b/package/kernel/mac80211/patches/600-11-rt2x00-rt2800lib-use-the-extended-EEPROM-map-for-RT3.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -376,7 +376,8 @@ static unsigned int rt2800_eeprom_word_i\n+@@ -381,7 +381,8 @@ static unsigned int rt2800_eeprom_word_i\n \t\t wiphy_name(rt2x00dev->hw->wiphy), word))\n \t\treturn 0;\n \ndiff --git a/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch b/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch\nindex 0ac7b040ec..c6d188d904 100644\n--- a/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch\n+++ b/package/kernel/mac80211/patches/600-12-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch\n@@ -10,8 +10,8 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -9077,6 +9077,8 @@ static int rt2800_init_eeprom(struct rt2\n- \t\trt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);\n+@@ -9080,6 +9080,8 @@ static int rt2800_init_eeprom(struct rt2\n+ \t\trf = rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID);\n \telse if (rt2x00_rt(rt2x00dev, RT3352))\n \t\trf = RF3322;\n +\telse if (rt2x00_rt(rt2x00dev, RT3883))\ndiff --git a/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch b/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch\nindex dc34a96d99..46ab6a5223 100644\n--- a/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch\n+++ b/package/kernel/mac80211/patches/600-13-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -3735,6 +3735,36 @@ static char rt2800_txpower_to_dev(struct\n+@@ -3738,6 +3738,36 @@ static char rt2800_txpower_to_dev(struct\n \t\treturn clamp_t(char, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER);\n }\n \n@@ -47,7 +47,7 @@ Signed-off-by: Gabor Juhos \n static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,\n \t\t\t\t struct ieee80211_conf *conf,\n \t\t\t\t struct rf_channel *rf,\n-@@ -3753,6 +3783,12 @@ static void rt2800_config_channel(struct\n+@@ -3756,6 +3786,12 @@ static void rt2800_config_channel(struct\n \t\t\trt2800_txpower_to_dev(rt2x00dev, rf->channel,\n \t\t\t\t\t info->default_power3);\n \n@@ -60,7 +60,7 @@ Signed-off-by: Gabor Juhos \n \tswitch (rt2x00dev->chip.rf) {\n \tcase RF2020:\n \tcase RF3020:\n-@@ -3857,6 +3893,15 @@ static void rt2800_config_channel(struct\n+@@ -3860,6 +3896,15 @@ static void rt2800_config_channel(struct\n \t\trt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);\n \t\trt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);\n \t\trt2800_bbp_write(rt2x00dev, 77, 0x98);\n@@ -76,7 +76,7 @@ Signed-off-by: Gabor Juhos \n \t} else {\n \t\trt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);\n \t\trt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);\n-@@ -3870,6 +3915,7 @@ static void rt2800_config_channel(struct\n+@@ -3873,6 +3918,7 @@ static void rt2800_config_channel(struct\n \t\t !rt2x00_rt(rt2x00dev, RT6352)) {\n \t\t\tif (rt2x00_has_cap_external_lna_bg(rt2x00dev)) {\n \t\t\t\trt2800_bbp_write(rt2x00dev, 82, 0x62);\n@@ -84,7 +84,7 @@ Signed-off-by: Gabor Juhos \n \t\t\t\trt2800_bbp_write(rt2x00dev, 75, 0x46);\n \t\t\t} else {\n \t\t\t\tif (rt2x00_rt(rt2x00dev, RT3593))\n-@@ -3878,19 +3924,22 @@ static void rt2800_config_channel(struct\n+@@ -3881,19 +3927,22 @@ static void rt2800_config_channel(struct\n \t\t\t\t\trt2800_bbp_write(rt2x00dev, 82, 0x84);\n \t\t\t\trt2800_bbp_write(rt2x00dev, 75, 0x50);\n \t\t\t}\n@@ -110,7 +110,7 @@ Signed-off-by: Gabor Juhos \n \t\t\trt2800_bbp_write(rt2x00dev, 83, 0x9a);\n \n \t\tif (rt2x00_has_cap_external_lna_a(rt2x00dev))\n-@@ -4013,6 +4062,23 @@ static void rt2800_config_channel(struct\n+@@ -4016,6 +4065,23 @@ static void rt2800_config_channel(struct\n \n \t\trt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);\n \ndiff --git a/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch b/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch\nindex e93d2dd96f..56157510eb 100644\n--- a/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch\n+++ b/package/kernel/mac80211/patches/600-14-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -3722,13 +3722,15 @@ static char rt2800_txpower_to_dev(struct\n+@@ -3725,13 +3725,15 @@ static char rt2800_txpower_to_dev(struct\n \t\t\t\t unsigned int channel,\n \t\t\t\t char txpower)\n {\ndiff --git a/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch b/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch\nindex 463346eec4..df182881ce 100644\n--- a/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch\n+++ b/package/kernel/mac80211/patches/600-15-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch\n@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -5101,7 +5101,8 @@ static void rt2800_config_txpower(struct\n+@@ -5108,7 +5108,8 @@ static void rt2800_config_txpower(struct\n \t\t\t\t struct ieee80211_channel *chan,\n \t\t\t\t int power_level)\n {\ndiff --git a/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch b/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch\nindex 3efac12246..9d5bfa7b7a 100644\n--- a/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch\n+++ b/package/kernel/mac80211/patches/600-16-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch\n@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -8959,7 +8959,8 @@ static u8 rt2800_get_txmixer_gain_24g(st\n+@@ -8962,7 +8962,8 @@ static u8 rt2800_get_txmixer_gain_24g(st\n {\n \tu16 word;\n \n@@ -20,8 +20,8 @@ Signed-off-by: Gabor Juhos \n +\t rt2x00_rt(rt2x00dev, RT3883))\n \t\treturn 0;\n \n- \trt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &word);\n-@@ -8973,7 +8974,8 @@ static u8 rt2800_get_txmixer_gain_5g(str\n+ \tword = rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG);\n+@@ -8976,7 +8977,8 @@ static u8 rt2800_get_txmixer_gain_5g(str\n {\n \tu16 word;\n \n@@ -30,4 +30,4 @@ Signed-off-by: Gabor Juhos \n +\t rt2x00_rt(rt2x00dev, RT3883))\n \t\treturn 0;\n \n- \trt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_A, &word);\n+ \tword = rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_A);\ndiff --git a/package/kernel/mac80211/patches/600-17-rt2x00-rt2800lib-use-correct-RT-XWI-size-for-RT3883.patch b/package/kernel/mac80211/patches/600-17-rt2x00-rt2800lib-use-correct-RT-XWI-size-for-RT3883.patch\nindex 9d12c76255..197aabd7bc 100644\n--- a/package/kernel/mac80211/patches/600-17-rt2x00-rt2800lib-use-correct-RT-XWI-size-for-RT3883.patch\n+++ b/package/kernel/mac80211/patches/600-17-rt2x00-rt2800lib-use-correct-RT-XWI-size-for-RT3883.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -587,6 +587,7 @@ void rt2800_get_txwi_rxwi_size(struct rt\n+@@ -591,6 +591,7 @@ void rt2800_get_txwi_rxwi_size(struct rt\n {\n \tswitch (rt2x00dev->chip.rt) {\n \tcase RT3593:\ndiff --git a/package/kernel/mac80211/patches/600-18-rt2x00-rt2800lib-fix-antenna-configuration-for-RT388.patch b/package/kernel/mac80211/patches/600-18-rt2x00-rt2800lib-fix-antenna-configuration-for-RT388.patch\nindex cd212f9d8d..24c0ef91b0 100644\n--- a/package/kernel/mac80211/patches/600-18-rt2x00-rt2800lib-fix-antenna-configuration-for-RT388.patch\n+++ b/package/kernel/mac80211/patches/600-18-rt2x00-rt2800lib-fix-antenna-configuration-for-RT388.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -2013,7 +2013,8 @@ void rt2800_config_ant(struct rt2x00_dev\n+@@ -2017,7 +2017,8 @@ void rt2800_config_ant(struct rt2x00_dev\n \trt2800_bbp_write(rt2x00dev, 3, r3);\n \trt2800_bbp_write(rt2x00dev, 1, r1);\n \ndiff --git a/package/kernel/mac80211/patches/600-19-rt2x00-rt2800lib-fix-LNA-gain-configuration-for-RT38.patch b/package/kernel/mac80211/patches/600-19-rt2x00-rt2800lib-fix-LNA-gain-configuration-for-RT38.patch\nindex 30ea12a5cd..52733ffeb9 100644\n--- a/package/kernel/mac80211/patches/600-19-rt2x00-rt2800lib-fix-LNA-gain-configuration-for-RT38.patch\n+++ b/package/kernel/mac80211/patches/600-19-rt2x00-rt2800lib-fix-LNA-gain-configuration-for-RT38.patch\n@@ -10,23 +10,23 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -2036,7 +2036,8 @@ static void rt2800_config_lna_gain(struc\n- \t\trt2800_eeprom_read(rt2x00dev, EEPROM_LNA, &eeprom);\n+@@ -2040,7 +2040,8 @@ static void rt2800_config_lna_gain(struc\n+ \t\teeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_LNA);\n \t\tlna_gain = rt2x00_get_field16(eeprom, EEPROM_LNA_A0);\n \t} else if (libconf->rf.channel <= 128) {\n -\t\tif (rt2x00_rt(rt2x00dev, RT3593)) {\n +\t\tif (rt2x00_rt(rt2x00dev, RT3593) ||\n +\t\t rt2x00_rt(rt2x00dev, RT3883)) {\n- \t\t\trt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);\n+ \t\t\teeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2);\n \t\t\tlna_gain = rt2x00_get_field16(eeprom,\n \t\t\t\t\t\t EEPROM_EXT_LNA2_A1);\n-@@ -2046,7 +2047,8 @@ static void rt2800_config_lna_gain(struc\n+@@ -2050,7 +2051,8 @@ static void rt2800_config_lna_gain(struc\n \t\t\t\t\t\t EEPROM_RSSI_BG2_LNA_A1);\n \t\t}\n \t} else {\n -\t\tif (rt2x00_rt(rt2x00dev, RT3593)) {\n +\t\tif (rt2x00_rt(rt2x00dev, RT3593) ||\n +\t\t rt2x00_rt(rt2x00dev, RT3883)) {\n- \t\t\trt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);\n+ \t\t\teeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2);\n \t\t\tlna_gain = rt2x00_get_field16(eeprom,\n \t\t\t\t\t\t EEPROM_EXT_LNA2_A2);\ndiff --git a/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch b/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch\nindex 8c563b8938..1227b87ae0 100644\n--- a/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch\n+++ b/package/kernel/mac80211/patches/600-20-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -5354,7 +5354,8 @@ static u8 rt2800_get_default_vgc(struct\n+@@ -5361,7 +5361,8 @@ static u8 rt2800_get_default_vgc(struct\n \t\telse\n \t\t\tvgc = 0x2e + rt2x00dev->lna_gain;\n \t} else { /* 5GHZ band */\n@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos \n \t\t\tvgc = 0x20 + (rt2x00dev->lna_gain * 5) / 3;\n \t\telse if (rt2x00_rt(rt2x00dev, RT5592))\n \t\t\tvgc = 0x24 + (2 * rt2x00dev->lna_gain);\n-@@ -5374,7 +5375,8 @@ static inline void rt2800_set_vgc(struct\n+@@ -5381,7 +5382,8 @@ static inline void rt2800_set_vgc(struct\n {\n \tif (qual->vgc_level != vgc_level) {\n \t\tif (rt2x00_rt(rt2x00dev, RT3572) ||\n@@ -30,7 +30,7 @@ Signed-off-by: Gabor Juhos \n \t\t\trt2800_bbp_write_with_rx_chain(rt2x00dev, 66,\n \t\t\t\t\t\t vgc_level);\n \t\t} else if (rt2x00_rt(rt2x00dev, RT5592)) {\n-@@ -5421,6 +5423,11 @@ void rt2800_link_tuner(struct rt2x00_dev\n+@@ -5428,6 +5430,11 @@ void rt2800_link_tuner(struct rt2x00_dev\n \t\t}\n \t\tbreak;\n \ndiff --git a/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch b/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch\nindex 6e9ef1071c..91917024d5 100644\n--- a/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch\n+++ b/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch\n@@ -10,8 +10,8 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -9092,7 +9092,8 @@ static int rt2800_validate_eeprom(struct\n- \trt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word);\n+@@ -9095,7 +9095,8 @@ static int rt2800_validate_eeprom(struct\n+ \tword = rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2);\n \tif (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) > 10)\n \t\trt2x00_set_field16(&word, EEPROM_RSSI_BG2_OFFSET2, 0);\n -\tif (!rt2x00_rt(rt2x00dev, RT3593)) {\n@@ -20,8 +20,8 @@ Signed-off-by: Gabor Juhos \n \t\tif (rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0x00 ||\n \t\t rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0xff)\n \t\t\trt2x00_set_field16(&word, EEPROM_RSSI_BG2_LNA_A1,\n-@@ -9112,7 +9113,8 @@ static int rt2800_validate_eeprom(struct\n- \trt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &word);\n+@@ -9115,7 +9116,8 @@ static int rt2800_validate_eeprom(struct\n+ \tword = rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2);\n \tif (abs(rt2x00_get_field16(word, EEPROM_RSSI_A2_OFFSET2)) > 10)\n \t\trt2x00_set_field16(&word, EEPROM_RSSI_A2_OFFSET2, 0);\n -\tif (!rt2x00_rt(rt2x00dev, RT3593)) {\n@@ -30,13 +30,13 @@ Signed-off-by: Gabor Juhos \n \t\tif (rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0x00 ||\n \t\t rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0xff)\n \t\t\trt2x00_set_field16(&word, EEPROM_RSSI_A2_LNA_A2,\n-@@ -9120,7 +9122,8 @@ static int rt2800_validate_eeprom(struct\n+@@ -9123,7 +9125,8 @@ static int rt2800_validate_eeprom(struct\n \t}\n \trt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_A2, word);\n \n -\tif (rt2x00_rt(rt2x00dev, RT3593)) {\n +\tif (rt2x00_rt(rt2x00dev, RT3593) ||\n +\t rt2x00_rt(rt2x00dev, RT3883)) {\n- \t\trt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &word);\n+ \t\tword = rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2);\n \t\tif (rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0x00 ||\n \t\t rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0xff)\ndiff --git a/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch b/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch\nindex 1a8ccbc9bd..caaa1d845d 100644\n--- a/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch\n+++ b/package/kernel/mac80211/patches/600-22-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch\n@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -4348,6 +4348,9 @@ static u8 rt2800_compensate_txpower(stru\n+@@ -4351,6 +4351,9 @@ static u8 rt2800_compensate_txpower(stru\n \tif (rt2x00_rt(rt2x00dev, RT3593))\n \t\treturn min_t(u8, txpower, 0xc);\n \ndiff --git a/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch b/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch\nindex 7d8d2f5e13..b864549735 100644\n--- a/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch\n+++ b/package/kernel/mac80211/patches/600-23-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch\n@@ -29,7 +29,7 @@ Signed-off-by: Gabor Juhos \n \t * need to lock the kfifo.\n \t */\n -\tfor (i = 0; i < rt2x00dev->tx->limit; i++) {\n--\t\trt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &status);\n+-\t\tstatus = rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO);\n -\n -\t\tif (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))\n -\t\t\tbreak;\n@@ -47,7 +47,7 @@ Signed-off-by: Gabor Juhos \n +\t\tif (++i >= rt2x00dev->tx->limit)\n +\t\t\tbreak;\n +\n-+ \t\trt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &status);\n++\t\tstatus = rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO);\n +\t} while (rt2x00_get_field32(status, TX_STA_FIFO_VALID));\n \n \t/* Schedule the tasklet for processing the tx status. */\n@@ -87,7 +87,7 @@ Signed-off-by: Gabor Juhos \n \n -\t/* Read status and ACK all interrupts */\n +\t/* Read status */\n- \trt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR, ®);\n+ \treg = rt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR);\n +\n +\tif (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) {\n +\t\t/* Due to unknown reason the hardware generates a\n@@ -96,7 +96,7 @@ Signed-off-by: Gabor Juhos \n +\t\t * here to see if we have to process the actual\n +\t\t * request.\n +\t\t */\n-+\t\trt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &txstatus);\n++\t\ttxstatus = rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO);\n +\t\tif (rt2800mmio_txstatus_is_spurious(rt2x00dev, txstatus)) {\n +\t\t\t/* Remove the TX_FIFO_STATUS bit so it won't be\n +\t\t\t * processed in this turn. The hardware will\ndiff --git a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch\nindex 435cc96fc5..f0cc00e5d7 100644\n--- a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch\n+++ b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch\n@@ -1,6 +1,6 @@\n---- a/.local-symbols\n-+++ b/.local-symbols\n-@@ -336,6 +336,7 @@ RT2X00_LIB_FIRMWARE=\n+--- a/local-symbols\n++++ b/local-symbols\n+@@ -288,6 +288,7 @@ RT2X00_LIB_FIRMWARE=\n RT2X00_LIB_CRYPTO=\n RT2X00_LIB_LEDS=\n RT2X00_LIB_DEBUGFS=\n@@ -55,9 +55,9 @@\n +#include \"rt2800.h\"\n +\n struct rt2800_ops {\n- \tvoid (*register_read)(struct rt2x00_dev *rt2x00dev,\n- \t\t\t const unsigned int offset, u32 *value);\n-@@ -147,6 +149,15 @@ static inline int rt2800_read_eeprom(str\n+ \tu32 (*register_read)(struct rt2x00_dev *rt2x00dev,\n+ \t\t\t const unsigned int offset);\n+@@ -145,6 +147,15 @@ static inline int rt2800_read_eeprom(str\n {\n \tconst struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;\n \n@@ -127,7 +127,7 @@\n \tDECLARE_KFIFO_PTR(txstatus_fifo, u32);\n --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -1418,6 +1418,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de\n+@@ -1421,6 +1421,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de\n \tINIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);\n \tINIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);\n \n@@ -138,7 +138,7 @@\n \t/*\n \t * Let the driver probe the device to detect the capabilities.\n \t */\n-@@ -1556,6 +1560,11 @@ void rt2x00lib_remove_dev(struct rt2x00_\n+@@ -1562,6 +1566,11 @@ void rt2x00lib_remove_dev(struct rt2x00_\n \t * Free the driver data.\n \t */\n \tkfree(rt2x00dev->drv_data);\ndiff --git a/package/kernel/mac80211/patches/606-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/kernel/mac80211/patches/606-rt2x00-allow_disabling_bands_through_platform_data.patch\nindex c3cd2f4341..202dfc0b89 100644\n--- a/package/kernel/mac80211/patches/606-rt2x00-allow_disabling_bands_through_platform_data.patch\n+++ b/package/kernel/mac80211/patches/606-rt2x00-allow_disabling_bands_through_platform_data.patch\n@@ -12,7 +12,7 @@\n #endif /* _RT2X00_PLATFORM_H */\n --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -1023,6 +1023,22 @@ static int rt2x00lib_probe_hw_modes(stru\n+@@ -1026,6 +1026,22 @@ static int rt2x00lib_probe_hw_modes(stru\n \tunsigned int num_rates;\n \tunsigned int i;\n \ndiff --git a/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch\nindex bca7be8533..b8b0188040 100644\n--- a/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch\n+++ b/package/kernel/mac80211/patches/607-rt2x00-add_platform_data_mac_addr.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -1001,8 +1001,13 @@ static void rt2x00lib_rate(struct ieee80\n+@@ -1004,8 +1004,13 @@ static void rt2x00lib_rate(struct ieee80\n \n void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr)\n {\ndiff --git a/package/kernel/mac80211/patches/608-rt2x00-allow_disabling_bands_through_dts.patch b/package/kernel/mac80211/patches/608-rt2x00-allow_disabling_bands_through_dts.patch\nindex 724e626ca9..ca66aa8e3b 100644\n--- a/package/kernel/mac80211/patches/608-rt2x00-allow_disabling_bands_through_dts.patch\n+++ b/package/kernel/mac80211/patches/608-rt2x00-allow_disabling_bands_through_dts.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -1027,6 +1027,16 @@ static int rt2x00lib_probe_hw_modes(stru\n+@@ -1030,6 +1030,16 @@ static int rt2x00lib_probe_hw_modes(stru\n \tstruct ieee80211_rate *rates;\n \tunsigned int num_rates;\n \tunsigned int i;\ndiff --git a/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch b/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch\nindex 51890e0a3b..46a8b6487f 100644\n--- a/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch\n+++ b/package/kernel/mac80211/patches/610-rt2x00-change-led-polarity-from-OF.patch\n@@ -8,7 +8,7 @@\n \n #include \"rt2x00.h\"\n #include \"rt2800lib.h\"\n-@@ -9279,6 +9280,17 @@ static int rt2800_init_eeprom(struct rt2\n+@@ -9282,6 +9283,17 @@ static int rt2800_init_eeprom(struct rt2\n \trt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC);\n \trt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY);\n \ndiff --git a/package/kernel/mac80211/patches/611-rt2x00-add-AP+STA-support.patch b/package/kernel/mac80211/patches/611-rt2x00-add-AP+STA-support.patch\nindex 5ef5fc8def..062b18a63b 100644\n--- a/package/kernel/mac80211/patches/611-rt2x00-add-AP+STA-support.patch\n+++ b/package/kernel/mac80211/patches/611-rt2x00-add-AP+STA-support.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c\n-@@ -1358,7 +1358,7 @@ static inline void rt2x00lib_set_if_comb\n+@@ -1361,7 +1361,7 @@ static inline void rt2x00lib_set_if_comb\n \t */\n \tif_limit = &rt2x00dev->if_limits_ap;\n \tif_limit->max = rt2x00dev->ops->max_ap_intf;\ndiff --git a/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch b/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch\nindex 64a62f4b07..c1fed6369f 100644\n--- a/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch\n+++ b/package/kernel/mac80211/patches/650-rt2x00-add-support-for-external-PA-on-MT7620.patch\n@@ -25,7 +25,7 @@ Signed-off-by: Daniel Golle \n * EEPROM LNA\n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -4114,6 +4114,61 @@ static void rt2800_config_channel(struct\n+@@ -4117,6 +4117,61 @@ static void rt2800_config_channel(struct\n \t\trt2800_iq_calibrate(rt2x00dev, rf->channel);\n \t}\n \n@@ -34,11 +34,11 @@ Signed-off-by: Daniel Golle \n +\t\t\t &rt2x00dev->cap_flags)) {\n +\t\t\trt2x00_warn(rt2x00dev, \"Using incomplete support for \" \\\n +\t\t\t\t\t \"external PA\\n\");\n-+\t\t\trt2800_register_read(rt2x00dev, RF_CONTROL3, ®);\n++\t\t\treg = rt2800_register_read(rt2x00dev, RF_CONTROL3);\n +\t\t\treg |= 0x00000101;\n +\t\t\trt2800_register_write(rt2x00dev, RF_CONTROL3, reg);\n +\n-+\t\t\trt2800_register_read(rt2x00dev, RF_BYPASS3, ®);\n++\t\t\treg = rt2800_register_read(rt2x00dev, RF_BYPASS3);\n +\t\t\treg |= 0x00000101;\n +\t\t\trt2800_register_write(rt2x00dev, RF_BYPASS3, reg);\n +\n@@ -84,12 +84,12 @@ Signed-off-by: Daniel Golle \n +\t\t}\n +\t}\n +\n- \trt2800_bbp_read(rt2x00dev, 4, &bbp);\n+ \tbbp = rt2800_bbp_read(rt2x00dev, 4);\n \trt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));\n \trt2800_bbp_write(rt2x00dev, 4, bbp);\n-@@ -9308,7 +9363,8 @@ static int rt2800_init_eeprom(struct rt2\n+@@ -9311,7 +9366,8 @@ static int rt2800_init_eeprom(struct rt2\n \t */\n- \trt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);\n+ \teeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1);\n \n -\tif (rt2x00_rt(rt2x00dev, RT3352)) {\n +\tif (rt2x00_rt(rt2x00dev, RT3352) ||\n@@ -97,11 +97,11 @@ Signed-off-by: Daniel Golle \n \t\tif (rt2x00_get_field16(eeprom,\n \t\t EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))\n \t\t __set_bit(CAPABILITY_EXTERNAL_PA_TX0,\n-@@ -9319,6 +9375,18 @@ static int rt2800_init_eeprom(struct rt2\n+@@ -9322,6 +9378,18 @@ static int rt2800_init_eeprom(struct rt2\n \t\t\t &rt2x00dev->cap_flags);\n \t}\n \n-+\trt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF2, &eeprom);\n++\teeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF2);\n +\n +\tif (rt2x00_rt(rt2x00dev, RT6352) && eeprom != 0 && eeprom != 0xffff) {\n +\t\tif (rt2x00_get_field16(eeprom,\ndiff --git a/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch b/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch\nindex b65bd7a73e..f052b4e822 100644\n--- a/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch\n+++ b/package/kernel/mac80211/patches/651-rt2x00-remove-unneccesary-code.patch\n@@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle \n \n --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c\n-@@ -4127,38 +4127,22 @@ static void rt2800_config_channel(struct\n+@@ -4130,38 +4130,22 @@ static void rt2800_config_channel(struct\n \t\t\treg |= 0x00000101;\n \t\t\trt2800_register_write(rt2x00dev, RF_BYPASS3, reg);\n \ndiff --git a/package/kernel/mac80211/patches/653-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch b/package/kernel/mac80211/patches/653-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch\nindex f90ce492f0..c057bba818 100644\n--- a/package/kernel/mac80211/patches/653-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch\n+++ b/package/kernel/mac80211/patches/653-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch\n@@ -110,7 +110,7 @@ Signed-off-by: Jes Sorensen \n MODULE_FIRMWARE(\"rtlwifi/rtl8192cufw_A.bin\");\n MODULE_FIRMWARE(\"rtlwifi/rtl8192cufw_B.bin\");\n MODULE_FIRMWARE(\"rtlwifi/rtl8192cufw_TMSC.bin\");\n-@@ -6210,6 +6211,8 @@ static struct usb_device_id dev_table[]\n+@@ -6212,6 +6213,8 @@ static struct usb_device_id dev_table[]\n {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0xb720, 0xff, 0xff, 0xff),\n \t.driver_info = (unsigned long)&rtl8723bu_fops},\n #ifdef CPTCFG_RTL8XXXU_UNTESTED\ndiff --git a/package/kernel/mac80211/patches/653-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch b/package/kernel/mac80211/patches/653-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch\nindex 31c4b6535b..91b51296a3 100644\n--- a/package/kernel/mac80211/patches/653-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch\n+++ b/package/kernel/mac80211/patches/653-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch\n@@ -13,7 +13,7 @@ Signed-off-by: Jes Sorensen \n \n --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c\n +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c\n-@@ -6324,6 +6324,9 @@ static struct usb_device_id dev_table[]\n+@@ -6326,6 +6326,9 @@ static struct usb_device_id dev_table[]\n #ifdef CPTCFG_RTL8XXXU_UNTESTED\n {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8179, 0xff, 0xff, 0xff),\n \t.driver_info = (unsigned long)&rtl8188eu_fops},\ndiff --git a/package/kernel/mac80211/patches/653-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch b/package/kernel/mac80211/patches/653-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch\nindex fa8ad28d97..587829a6c2 100644\n--- a/package/kernel/mac80211/patches/653-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch\n+++ b/package/kernel/mac80211/patches/653-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch\n@@ -11,7 +11,7 @@ Signed-off-by: Jes Sorensen \n \n --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c\n +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c\n-@@ -6327,6 +6327,9 @@ static struct usb_device_id dev_table[]\n+@@ -6329,6 +6329,9 @@ static struct usb_device_id dev_table[]\n /* Tested by Hans de Goede - rtl8188etv */\n {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x0179, 0xff, 0xff, 0xff),\n \t.driver_info = (unsigned long)&rtl8188eu_fops},\ndiff --git a/package/kernel/mac80211/patches/653-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch b/package/kernel/mac80211/patches/653-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch\nindex 05c45ca24d..59195ebbd0 100644\n--- a/package/kernel/mac80211/patches/653-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch\n+++ b/package/kernel/mac80211/patches/653-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch\n@@ -13,7 +13,7 @@ Signed-off-by: Jes Sorensen \n \n --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c\n +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c\n-@@ -6330,6 +6330,9 @@ static struct usb_device_id dev_table[]\n+@@ -6332,6 +6332,9 @@ static struct usb_device_id dev_table[]\n /* Sitecom rtl8188eus */\n {USB_DEVICE_AND_INTERFACE_INFO(0x0df6, 0x0076, 0xff, 0xff, 0xff),\n \t.driver_info = (unsigned long)&rtl8188eu_fops},\ndiff --git a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch\nindex 106ef706b8..cfde08d4ea 100644\n--- a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch\n+++ b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch\n@@ -1,17 +1,17 @@\n --- a/drivers/net/wireless/marvell/libertas/cfg.c\n +++ b/drivers/net/wireless/marvell/libertas/cfg.c\n-@@ -2127,6 +2127,8 @@ struct wireless_dev *lbs_cfg_alloc(struc\n+@@ -2043,6 +2043,8 @@ struct wireless_dev *lbs_cfg_alloc(struc\n \t\tgoto err_wiphy_new;\n \t}\n \n +\tset_wiphy_dev(wdev->wiphy, dev);\n +\n- \tlbs_deb_leave(LBS_DEB_CFG80211);\n \treturn wdev;\n \n+ err_wiphy_new:\n --- a/drivers/net/wireless/marvell/libertas/main.c\n +++ b/drivers/net/wireless/marvell/libertas/main.c\n-@@ -986,6 +986,7 @@ struct lbs_private *lbs_add_card(void *c\n+@@ -933,6 +933,7 @@ struct lbs_private *lbs_add_card(void *c\n \t\tgoto err_adapter;\n \t}\n \ndiff --git a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch\nindex 04b4954d29..b26505de21 100644\n--- a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch\n+++ b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/marvell/libertas/cfg.c\n +++ b/drivers/net/wireless/marvell/libertas/cfg.c\n-@@ -2217,6 +2217,8 @@ int lbs_cfg_register(struct lbs_private\n+@@ -2119,6 +2119,8 @@ int lbs_cfg_register(struct lbs_private\n \twdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);\n \twdev->wiphy->reg_notifier = lbs_reg_notifier;\n \ndiff --git a/package/kernel/mac80211/patches/810-b43-gpio-mask-module-option.patch b/package/kernel/mac80211/patches/810-b43-gpio-mask-module-option.patch\nindex fd9e6fd974..5ce49d3a07 100644\n--- a/package/kernel/mac80211/patches/810-b43-gpio-mask-module-option.patch\n+++ b/package/kernel/mac80211/patches/810-b43-gpio-mask-module-option.patch\n@@ -10,8 +10,8 @@\n \tstruct b43_phy phy;\n --- a/drivers/net/wireless/broadcom/b43/main.c\n +++ b/drivers/net/wireless/broadcom/b43/main.c\n-@@ -75,6 +75,11 @@ MODULE_FIRMWARE(\"b43/ucode16_mimo.fw\");\n- MODULE_FIRMWARE(\"b43/ucode5.fw\");\n+@@ -85,6 +85,11 @@ MODULE_FIRMWARE(\"b43/ucode40.fw\");\n+ MODULE_FIRMWARE(\"b43/ucode42.fw\");\n MODULE_FIRMWARE(\"b43/ucode9.fw\");\n \n +static int modparam_gpiomask = 0x000F;\n@@ -22,7 +22,7 @@\n static int modparam_bad_frames_preempt;\n module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);\n MODULE_PARM_DESC(bad_frames_preempt,\n-@@ -2882,10 +2887,10 @@ static int b43_gpio_init(struct b43_wlde\n+@@ -2892,10 +2897,10 @@ static int b43_gpio_init(struct b43_wlde\n \tu32 mask, set;\n \n \tb43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);\ndiff --git a/package/kernel/mac80211/patches/811-b43_no_pio.patch b/package/kernel/mac80211/patches/811-b43_no_pio.patch\nindex 79428c2784..d23387c8cd 100644\n--- a/package/kernel/mac80211/patches/811-b43_no_pio.patch\n+++ b/package/kernel/mac80211/patches/811-b43_no_pio.patch\n@@ -11,7 +11,7 @@\n b43-$(CPTCFG_B43_LEDS)\t\t+= leds.o\n --- a/drivers/net/wireless/broadcom/b43/main.c\n +++ b/drivers/net/wireless/broadcom/b43/main.c\n-@@ -2008,10 +2008,12 @@ static void b43_do_interrupt_thread(stru\n+@@ -2018,10 +2018,12 @@ static void b43_do_interrupt_thread(stru\n \t\t\tdma_reason[0], dma_reason[1],\n \t\t\tdma_reason[2], dma_reason[3],\n \t\t\tdma_reason[4], dma_reason[5]);\ndiff --git a/package/kernel/mac80211/patches/812-b43-add-antenna-control.patch b/package/kernel/mac80211/patches/812-b43-add-antenna-control.patch\nindex 33c9402f18..932c83b48e 100644\n--- a/package/kernel/mac80211/patches/812-b43-add-antenna-control.patch\n+++ b/package/kernel/mac80211/patches/812-b43-add-antenna-control.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/broadcom/b43/main.c\n +++ b/drivers/net/wireless/broadcom/b43/main.c\n-@@ -1648,7 +1648,7 @@ static void b43_write_beacon_template(st\n+@@ -1658,7 +1658,7 @@ static void b43_write_beacon_template(st\n \t\t\t\t len, ram_offset, shm_size_offset, rate);\n \n \t/* Write the PHY TX control parameters. */\n@@ -9,7 +9,7 @@\n \tantenna = b43_antenna_to_phyctl(antenna);\n \tctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);\n \t/* We can't send beacons with short preamble. Would get PHY errors. */\n-@@ -3297,8 +3297,8 @@ static int b43_chip_init(struct b43_wlde\n+@@ -3307,8 +3307,8 @@ static int b43_chip_init(struct b43_wlde\n \n \t/* Select the antennae */\n \tif (phy->ops->set_rx_antenna)\n@@ -20,7 +20,7 @@\n \n \tif (phy->type == B43_PHYTYPE_B) {\n \t\tvalue16 = b43_read16(dev, 0x005E);\n-@@ -3998,7 +3998,6 @@ static int b43_op_config(struct ieee8021\n+@@ -4008,7 +4008,6 @@ static int b43_op_config(struct ieee8021\n \tstruct b43_wldev *dev = wl->current_dev;\n \tstruct b43_phy *phy = &dev->phy;\n \tstruct ieee80211_conf *conf = &hw->conf;\n@@ -28,7 +28,7 @@\n \tint err = 0;\n \n \tmutex_lock(&wl->mutex);\n-@@ -4041,11 +4040,9 @@ static int b43_op_config(struct ieee8021\n+@@ -4051,11 +4050,9 @@ static int b43_op_config(struct ieee8021\n \t}\n \n \t/* Antennas for RX and management frame TX. */\n@@ -42,7 +42,7 @@\n \n \tif (wl->radio_enabled != phy->radio_on) {\n \t\tif (wl->radio_enabled) {\n-@@ -5189,6 +5186,47 @@ static int b43_op_get_survey(struct ieee\n+@@ -5199,6 +5196,47 @@ static int b43_op_get_survey(struct ieee\n \treturn 0;\n }\n \n@@ -90,7 +90,7 @@\n static const struct ieee80211_ops b43_hw_ops = {\n \t.tx\t\t\t= b43_op_tx,\n \t.conf_tx\t\t= b43_op_conf_tx,\n-@@ -5210,6 +5248,8 @@ static const struct ieee80211_ops b43_hw\n+@@ -5220,6 +5258,8 @@ static const struct ieee80211_ops b43_hw\n \t.sw_scan_complete\t= b43_op_sw_scan_complete_notifier,\n \t.get_survey\t\t= b43_op_get_survey,\n \t.rfkill_poll\t\t= b43_rfkill_poll,\n@@ -99,7 +99,7 @@\n };\n \n /* Hard-reset the chip. Do not call this directly.\n-@@ -5513,6 +5553,8 @@ static int b43_one_core_attach(struct b4\n+@@ -5523,6 +5563,8 @@ static int b43_one_core_attach(struct b4\n \tif (!wldev)\n \t\tgoto out;\n \n@@ -108,9 +108,9 @@\n \twldev->use_pio = b43_modparam_pio;\n \twldev->dev = dev;\n \twldev->wl = wl;\n-@@ -5605,6 +5647,9 @@ static struct b43_wl *b43_wireless_init(\n+@@ -5617,6 +5659,9 @@ static struct b43_wl *b43_wireless_init(\n \n- \thw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;\n+ \twiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);\n \n +\thw->wiphy->available_antennas_rx = 0x3;\n +\thw->wiphy->available_antennas_tx = 0x3;\ndiff --git a/package/kernel/mac80211/patches/814-b43-only-use-gpio-0-1-for-led.patch b/package/kernel/mac80211/patches/814-b43-only-use-gpio-0-1-for-led.patch\nindex 8d0c0412d2..03f4524c88 100644\n--- a/package/kernel/mac80211/patches/814-b43-only-use-gpio-0-1-for-led.patch\n+++ b/package/kernel/mac80211/patches/814-b43-only-use-gpio-0-1-for-led.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/broadcom/b43/main.c\n +++ b/drivers/net/wireless/broadcom/b43/main.c\n-@@ -2899,6 +2899,14 @@ static int b43_gpio_init(struct b43_wlde\n+@@ -2909,6 +2909,14 @@ static int b43_gpio_init(struct b43_wlde\n \t} else if (dev->dev->chip_id == 0x5354) {\n \t\t/* Don't allow overtaking buttons GPIOs */\n \t\tset &= 0x2; /* 0x2 is LED GPIO on BCM5354 */\ndiff --git a/package/kernel/mac80211/patches/815-b43-always-take-overlapping-devs.patch b/package/kernel/mac80211/patches/815-b43-always-take-overlapping-devs.patch\nindex ef7f3c92d2..f07151aa4e 100644\n--- a/package/kernel/mac80211/patches/815-b43-always-take-overlapping-devs.patch\n+++ b/package/kernel/mac80211/patches/815-b43-always-take-overlapping-devs.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/broadcom/b43/main.c\n +++ b/drivers/net/wireless/broadcom/b43/main.c\n-@@ -117,7 +117,7 @@ static int b43_modparam_pio = 0;\n+@@ -127,7 +127,7 @@ static int b43_modparam_pio = 0;\n module_param_named(pio, b43_modparam_pio, int, 0644);\n MODULE_PARM_DESC(pio, \"Use PIO accesses by default: 0=DMA, 1=PIO\");\n \ndiff --git a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch\nindex 91831188ac..1ae33cf072 100644\n--- a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch\n+++ b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch\n@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki \n \n --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c\n-@@ -1180,6 +1180,7 @@ int __init brcmf_core_init(void)\n+@@ -1193,6 +1193,7 @@ int __init brcmf_core_init(void)\n {\n \tif (!schedule_work(&brcmf_driver_work))\n \t\treturn -EBUSY;\n@@ -25,7 +25,7 @@ Signed-off-by: Rafał Miłecki \n +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c\n @@ -444,6 +444,7 @@ struct brcmf_fw {\n \tu16 bus_nr;\n- \tvoid (*done)(struct device *dev, const struct firmware *fw,\n+ \tvoid (*done)(struct device *dev, int err, const struct firmware *fw,\n \t\t void *nvram_image, u32 nvram_len);\n +\tstruct completion *completion;\n };\n@@ -34,7 +34,7 @@ Signed-off-by: Rafał Miłecki \n @@ -478,6 +479,8 @@ static void brcmf_fw_request_nvram_done(\n \t\tgoto fail;\n \n- \tfwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);\n+ \tfwctx->done(fwctx->dev, 0, fwctx->code, nvram, nvram_length);\n +\tif (fwctx->completion)\n +\t\tcomplete(fwctx->completion);\n \tkfree(fwctx);\n@@ -43,31 +43,22 @@ Signed-off-by: Rafał Miłecki \n @@ -485,6 +488,8 @@ fail:\n \tbrcmf_dbg(TRACE, \"failed: dev=%s\\n\", dev_name(fwctx->dev));\n \trelease_firmware(fwctx->code);\n- \tdevice_release_driver(fwctx->dev);\n+ \tfwctx->done(fwctx->dev, -ENOENT, NULL, NULL, 0);\n +\tif (fwctx->completion)\n +\t\tcomplete(fwctx->completion);\n \tkfree(fwctx);\n }\n \n-@@ -500,6 +505,8 @@ static void brcmf_fw_request_code_done(c\n- \t/* only requested code so done here */\n- \tif (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {\n- \t\tfwctx->done(fwctx->dev, fw, NULL, 0);\n-+\t\tif (fwctx->completion)\n-+\t\t\tcomplete(fwctx->completion);\n- \t\tkfree(fwctx);\n- \t\treturn;\n- \t}\n-@@ -517,6 +524,8 @@ static void brcmf_fw_request_code_done(c\n- fail:\n+@@ -516,6 +521,8 @@ fail:\n \tbrcmf_dbg(TRACE, \"failed: dev=%s\\n\", dev_name(fwctx->dev));\n- \tdevice_release_driver(fwctx->dev);\n+ done:\n+ \tfwctx->done(fwctx->dev, ret, fw, NULL, 0);\n +\tif (fwctx->completion)\n +\t\tcomplete(fwctx->completion);\n \tkfree(fwctx);\n }\n \n-@@ -528,6 +537,8 @@ int brcmf_fw_get_firmwares_pcie(struct d\n+@@ -527,6 +534,8 @@ int brcmf_fw_get_firmwares_pcie(struct d\n \t\t\t\tu16 domain_nr, u16 bus_nr)\n {\n \tstruct brcmf_fw *fwctx;\n@@ -76,7 +67,7 @@ Signed-off-by: Rafał Miłecki \n \n \tbrcmf_dbg(TRACE, \"enter: dev=%s\\n\", dev_name(dev));\n \tif (!fw_cb || !code)\n-@@ -548,9 +559,17 @@ int brcmf_fw_get_firmwares_pcie(struct d\n+@@ -547,9 +556,17 @@ int brcmf_fw_get_firmwares_pcie(struct d\n \tfwctx->domain_nr = domain_nr;\n \tfwctx->bus_nr = bus_nr;\n \ndiff --git a/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch\nindex 774b333402..7fc1e449d0 100644\n--- a/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch\n+++ b/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch\n@@ -10,8 +10,8 @@ Signed-off-by: Rafał Miłecki \n \n --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-@@ -656,9 +656,37 @@ static struct wireless_dev *brcmf_cfg802\n- \t\t\t\t\t\t u32 *flags,\n+@@ -655,9 +655,37 @@ static struct wireless_dev *brcmf_cfg802\n+ \t\t\t\t\t\t enum nl80211_iftype type,\n \t\t\t\t\t\t struct vif_params *params)\n {\n +\tstruct net_device *dev;\ndiff --git a/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch b/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch\nindex 1819cf3999..7c1841b770 100644\n--- a/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch\n+++ b/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch\n@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell \n \n --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c\n-@@ -2775,6 +2775,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip\n+@@ -2849,6 +2849,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip\n \t * preference in cfg struct to apply this to\n \t * FW later while initializing the dongle\n \t */\ndiff --git a/package/kernel/mac80211/patches/910-ath10k-activate-user-space-firmware-loading-again.patch b/package/kernel/mac80211/patches/910-ath10k-activate-user-space-firmware-loading-again.patch\nnew file mode 100644\nindex 0000000000..fba6a5e8da\n--- /dev/null\n+++ b/package/kernel/mac80211/patches/910-ath10k-activate-user-space-firmware-loading-again.patch\n@@ -0,0 +1,35 @@\n+From 8d96533275c9b403f0413718e6b117a03a83fb57 Mon Sep 17 00:00:00 2001\n+From: Hauke Mehrtens \n+Date: Thu, 24 Aug 2017 22:45:44 +0200\n+Subject: ath10k: activate user space firmware loading again\n+\n+In commit 9f5bcfe93315 (\"ath10k: silence firmware file probing\n+warnings\") the firmware loading was changed from request_firmware() to\n+request_firmware_direct() to silence some warnings in case it fails.\n+request_firmware_direct() directly searches in the file system only and\n+does not send a hotplug event to user space in case it could not find\n+the firmware directly.\n+In LEDE we use a user space script to extract the calibration data from\n+the flash memory which gets triggered by the hotplug event. This way the\n+firmware gets extracted from some vendor specific partition when the\n+driver requests this firmware. This mechanism does not work any more\n+after this change.\n+\n+Fixes: 9f5bcfe93315 (\"ath10k: silence firmware file probing warnings\")\n+Signed-off-by: Hauke Mehrtens \n+Cc: Michal Kazior \n+---\n+ drivers/net/wireless/ath/ath10k/core.c | 2 +-\n+ 1 file changed, 1 insertion(+), 1 deletion(-)\n+\n+--- a/drivers/net/wireless/ath/ath10k/core.c\n++++ b/drivers/net/wireless/ath/ath10k/core.c\n+@@ -519,7 +519,7 @@ static const struct firmware *ath10k_fet\n+ \t\tdir = \".\";\n+ \n+ \tsnprintf(filename, sizeof(filename), \"%s/%s\", dir, file);\n+-\tret = request_firmware_direct(&fw, filename, ar->dev);\n++\tret = request_firmware(&fw, filename, ar->dev);\n+ \tath10k_dbg(ar, ATH10K_DBG_BOOT, \"boot fw request '%s': %d\\n\",\n+ \t\t filename, ret);\n+ \ndiff --git a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch\nindex b966516e57..e58b3c6b09 100644\n--- a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch\n+++ b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch\n@@ -14,7 +14,7 @@ Signed-off-by: Sven Eckelmann \n \n --- a/drivers/net/wireless/ath/ath10k/core.c\n +++ b/drivers/net/wireless/ath/ath10k/core.c\n-@@ -2329,6 +2329,16 @@ int ath10k_core_register(struct ath10k *\n+@@ -2435,6 +2435,16 @@ int ath10k_core_register(struct ath10k *\n \tar->chip_id = chip_id;\n \tqueue_work(ar->workqueue, &ar->register_work);\n \ndiff --git a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch\nindex 4cf1b9f92a..3f25a6fe51 100644\n--- a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch\n+++ b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath10k/mac.c\n +++ b/drivers/net/wireless/ath/ath10k/mac.c\n-@@ -8003,6 +8003,21 @@ static int ath10k_mac_init_rd(struct ath\n+@@ -8066,6 +8066,21 @@ static int ath10k_mac_init_rd(struct ath\n \treturn 0;\n }\n \n@@ -22,9 +22,9 @@\n int ath10k_mac_register(struct ath10k *ar)\n {\n \tstatic const u32 cipher_suites[] = {\n-@@ -8248,6 +8263,12 @@ int ath10k_mac_register(struct ath10k *a\n- \tar->hw->wiphy->cipher_suites = cipher_suites;\n- \tar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);\n+@@ -8313,6 +8328,12 @@ int ath10k_mac_register(struct ath10k *a\n+ \n+ \twiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);\n \n +#ifdef CPTCFG_MAC80211_LEDS\n +\tieee80211_create_tpt_led_trigger(ar->hw,\ndiff --git a/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch b/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch\nindex d302a7d2a3..0af8025d96 100644\n--- a/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch\n+++ b/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath10k/core.c\n +++ b/drivers/net/wireless/ath/ath10k/core.c\n-@@ -691,7 +691,7 @@ static int ath10k_core_get_board_id_from\n+@@ -757,7 +757,7 @@ static int ath10k_core_get_board_id_from\n \tif (ret) {\n \t\tath10k_err(ar, \"could not execute otp for board id check: %d\\n\",\n \t\t\t ret);\ndiff --git a/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch\nindex 357faee4bf..a958c78b43 100644\n--- a/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch\n+++ b/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/marvell/mwl8k.c\n +++ b/drivers/net/wireless/marvell/mwl8k.c\n-@@ -6264,6 +6264,8 @@ static int mwl8k_probe(struct pci_dev *p\n+@@ -6266,6 +6266,8 @@ static int mwl8k_probe(struct pci_dev *p\n \n \tpriv->running_bsses = 0;\n \n@@ -9,7 +9,7 @@\n \treturn rc;\n \n err_stop_firmware:\n-@@ -6297,8 +6299,6 @@ static void mwl8k_remove(struct pci_dev\n+@@ -6299,8 +6301,6 @@ static void mwl8k_remove(struct pci_dev\n \t\treturn;\n \tpriv = hw->priv;\n \ndiff --git a/package/kernel/mac80211/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch b/package/kernel/mac80211/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch\nindex d49be4df70..914472aab9 100644\n--- a/package/kernel/mac80211/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch\n+++ b/package/kernel/mac80211/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch\n@@ -1,6 +1,6 @@\n --- a/drivers/net/wireless/ath/ath10k/htt.h\n +++ b/drivers/net/wireless/ath/ath10k/htt.h\n-@@ -199,7 +199,7 @@ enum htt_rx_ring_flags {\n+@@ -200,7 +200,7 @@ enum htt_rx_ring_flags {\n };\n \n #define HTT_RX_RING_SIZE_MIN 128\n","prefixes":["LEDE-DEV","RFC","1/4"]}