summary'>refs'>log'>tree'>commit'>diffstats
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2019-05-14 21:19:03 +0100
committerBertrand Jacquin <bertrand@jacquin.bzh>2019-05-14 21:19:03 +0100
commit'>50d999ec25c023ceb739fff3cf5f856d28660f1b ( ('>patch)
tree'>c5e03490a9f16479a77d8e153a6f9b6d0914ba70
parentsys-kernel/longterm-sources: Bump 4.14 (diff)
downloadetc-portage-patches-50d999ec25c023ceb739fff3cf5f856d28660f1b.tar.gz
sys-kernel/longterm-sources: Bump 4.19
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch44
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0002-smsx95xx-fix-crimes-against-truesize.patch44
-rw-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch44
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0004-Allow-mac-address-to-be-set-in-smsc95xx.patch44
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0005-Protect-__release_resource-against-resources-without.patch44
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch44
--rw-r--r--'>sys-kernel/boest-v4.19.42/raspberrypi/0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch44
--rw-r--r--'>sys-kernel/boest-v4.19.42/raspberrypi/0008-irqchip-bcm2835-Add-FIQ-support.patch44
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch44
-rw-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch44
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch44
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0012-spi-bcm2835-Disable-forced-software-CS.patch44
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0013-spi-bcm2835-Remove-unused-code.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0015-firmware-Updated-mailbox-header.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0017-watchdog-bcm2835-Support-setting-reboot-partition.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0020-Register-the-clocks-early-during-the-boot-process-so.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0024-clk-bcm2835-Add-claim-clocks-property.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0027-sound-Demote-deferral-errors-to-INFO-level.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0028-Update-vfpmodule.c.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0029-i2c-bcm2835-Add-debug-support.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0030-mm-Remove-the-PFN-busy-warning.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0031-ASoC-Add-prompt-for-ICS43432-codec.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0035-amba_pl011-Round-input-clock-up.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0037-amba_pl011-Add-cts-event-workaround-DT-property.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0039-Main-bcm2708-bcm2709-linux-port.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0040-Add-dwc_otg-driver.patch8
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0041-bcm2708-framebuffer-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0042-Speed-up-console-framebuffer-imageblit-function.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0043-dmaengine-Add-support-for-BCM2708.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0044-MMC-added-alternative-MMC-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch20
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0049-Add-SMI-driver.patch37
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0051-Add-SMI-NAND-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0052-Add-cpufreq-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0053-Add-Chris-Boot-s-i2c-driver.patch8
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0054-char-broadcom-Add-vcio-module.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0055-firmware-bcm2835-Support-ARCH_BCM270x.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch8
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0057-BCM2708-Add-core-Device-Tree-support.patch259
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0059-fbdev-add-FBIOCOPYAREA-ioctl.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0060-Added-Device-IDs-for-August-DVB-T-205.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch38
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch20
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0066-ASoC-Add-support-for-Rpi-DAC.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0068-Added-support-for-HiFiBerry-DAC.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0070-Add-driver-for-rpi-proto.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0071-Add-Support-for-JustBoom-Audio-boards.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch15
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0078-Support-for-Blokas-Labs-pisound-board.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch8
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0083-Driver-support-for-Google-voiceHAT-soundcard.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0084-Driver-and-overlay-for-Allo-Katana-DAC.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0089-rpi_display-add-backlight-driver-and-overlay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch25199
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0092-OF-DT-Overlay-configfs-interface.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0093-brcm-adds-support-for-BCM43341-wifi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0094-brcmfmac-Mute-expected-startup-errors.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0095-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0096-config-Add-default-configs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0097-Add-arm64-configuration-and-device-tree-differences..patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0098-ARM64-DWC_OTG-Port-dwc_otg-driver-to-ARM64.patch6
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0101-build-arm64-Add-rules-for-.dtbo-files-for-dts-overla.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0102-cache-export-clean-and-invalidate.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0103-AXI-performance-monitor-driver-2222.patch13
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0104-mcp2515-Use-DT-supplied-interrupt-flags.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0105-Tidy-up-of-the-ft5406-driver-to-use-DT-2189.patch102
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0106-cgroup-Disable-cgroup-memory-by-default.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0107-ARM-bcm2835-Set-Serial-number-and-Revision.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0108-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0109-serial-8250-bcm2835aux-suppress-EPROBE_DEFER.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0110-raspberrypi-firmware-Export-the-general-transaction-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0111-drm-vc4-Add-a-mode-for-using-the-closed-firmware-for.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0112-drm-vc4-Name-the-primary-and-cursor-planes-in-fkms.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0113-drm-vc4-Add-DRM_DEBUG_ATOMIC-for-the-insides-of-fkms.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0114-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0115-drm-vc4-Add-support-for-setting-DPMS-in-firmwarekms.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0116-drm-vc4-Add-FB-modifier-support-to-firmwarekms.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0117-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0118-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0119-drm-vc4-Fix-warning-about-vblank-interrupts-before-D.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0120-drm-vc4-Skip-SET_CURSOR_INFO-when-the-cursor-content.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0121-drm-vc4-Remove-duplicate-primary-cursor-fields-from-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0122-vc4_firmware_kms-fix-build.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0123-hack-cache-Fix-linker-error.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0124-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0125-sound-bcm-Fix-memset-dereference-warning.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0126-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0127-lan78xx-Read-initial-EEE-status-from-DT.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0128-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0130-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0131-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch4
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0132-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch4
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0133-of-configfs-Use-of_overlay_fdt_apply-API-call.patch44
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0135-brcmfmac-Re-enable-firmware-roaming-support.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0136-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0137-staging-vc04_services-Derive-g_cache_line_size.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0138-Add-rpi-poe-fan-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0139-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0140-bcm2835-interpolate-audio-delay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0141-vchiq_2835_arm-Implement-a-DMA-pool-for-small-bulk-t.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0142-BCM2708_DT-Use-upstreamed-GPIO-expander-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0143-overlays-Fix-a-few-dtc-warnings.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0144-bcm2708-rpi-Disable-txp-interrupt-unless-using-vc4-k.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0145-config-Enable-Raspberry-Pi-voltage-monitor.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0146-hwmon-raspberrypi-Prevent-voltage-low-warnings-from-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0147-firmware-raspberrypi-Add-backward-compatible-get_thr.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0148-Increase-firmware-call-buffer-size-to-48-bytes.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0149-sc16is7xx-Don-t-spin-if-no-data-received.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0150-configs-Rebuild-bcmrpi3_defconfig-to-fix-warnings.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0151-brcmfmac-Disable-ARP-offloading-when-promiscuous.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0152-config-enable-Audio-Graph-Card-module.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0153-config-Add-IPVLAN-module.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0154-config-Add-I2C_TINY_USB-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0155-Add-device-tree-overlay-for-HD44780.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0156-Add-hd44780-module-to-defconfig.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0157-overlays-Add-addr-parameter-to-i2c-rtc-gpio.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0158-ARM-BCM270X-Add-the-18-bit-DPI-pinmux-to-the-RPI-DTs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0159-overlays-Add-an-overlay-for-the-Adafruit-Kippah-with.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0160-overlays-Remove-stale-notes-about-vc4-s-CMA-alignmen.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0161-spi-Make-GPIO-CSs-honour-the-SPI_NO_CS-flag.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0162-devicetree-add-RPi-CM3-dts-to-arm64-mimic-the-RPi-3B.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0163-Add-support-for-audioinjector.net-ultra-soundcard.-2.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0164-ASoC-cs4265-Add-a-S-PDIF-enable-switch.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0165-ASoC-cs4265-Add-native-32bit-I2S-transport.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0166-configs-Add-SENSOR_GPIO_FAN-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0167-BCM270X_DT-Add-gpio-fan-overlay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0168-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0169-configs-Add-CONFIG_HID_BIGBEN_FF-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0170-ASoC-cs4265-Add-a-MIC-pre.-route-2696.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0171-Update-gpio-fan-overlay.dts-2711.patch8
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0172-drivers-thermal-step_wise-add-support-for-hysteresis.patch6
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0173-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0174-hwmon-adjust-rpi-poe-fan-overlay-trip-points.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0175-overlays-add-overrides-for-PoE-HAT-fan-control.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0176-overlays-Add-gpio-no-bank0-irq-overlay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0177-Add-hy28b-2017-model-device-tree-overlay-2721.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0178-config-Add-CONFIG_USBIP_VUDC.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0179-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0180-overlays-pi3-disable-bt-Clear-out-bt_pins-node.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0181-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0182-Update-issue-templates-2736.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0183-overlays-uart0-return-GPIOs-14-and-15-to-inputs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0184-mmc-bcm2835-sdhost-Fix-warnings-on-arm64.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0185-Fix-warning-in-bcm2835-smi-nand.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0186-media-ov5647-Add-set_fmt-and-get_fmt-calls.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0187-media-Documentation-DT-add-device-tree-for-PWDN-cont.patch (renamed from sys-kernel/boest-v4.19.42/raspberrypi/0187-Documentation-DT-add-device-tree-for-PWDN-control.patch)5
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0188-media-ov5647-Add-support-for-PWDN-GPIO.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0189-media-ov5647-Add-support-for-non-continuous-clock-mo.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0190-media-tc358743-Increase-FIFO-level-to-374.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0191-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0192-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0193-media-tc358743-Check-I2C-succeeded-during-probe.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0194-media-adv7180-Default-to-the-first-valid-input.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0195-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0196-media-videodev2-Add-helper-defines-for-printing-FOUR.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0197-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0198-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0199-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0200-defconfig-Enable-Unicam-driver-and-various-sources-o.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0201-media-adv7180-Nasty-hack-to-allow-input-selection.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0202-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0203-BCM270X_DT-Add-CSI-defines-for-all-the-downstream-Pi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0204-arm-dt-Add-DT-overlays-for-ADV7282M-OV5647-and-TC358.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0205-dtoverlays-Add-support-for-ADV7280-M-ADV7281-M-and-A.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0207-vcsm-Fix-an-NULL-dereference-in-the-import_dmabuf-er.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0208-Update-README-2750.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0209-overlays-Remove-superfluous-address-size-cells.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0210-Revert-ASoC-wm8804-MCLK-configuration-options-32-bit.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0211-rpi-wm8804-soundcard-drop-PWRDN-register-writes.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0212-rpi-wm8804-soundcard-configure-wm8804-clocks-only-on.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0213-dtoverlays-Add-i2c-on-0-1-option-to-TC358743-ADV7282.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0214-overlays-Update-upstream-overlay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0215-BCM2708_DT-update-firmware-node-binding.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0216-BCM2710_DT-fix-gpio-expander-bindings.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0217-ARM-dts-bcm283x-The-lan7515-PHY-node-has-moved.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0218-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0219-dt-bindings-Document-microchip-downshift-after.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0220-ARM-dts-bcm283x-Set-downshift-after-for-Pi-3B.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0221-BCM270X_DT-Add-new-Ethernet-DT-parameters.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0222-BCM270X_DT-Mark-eth_downshift_after-as-an-integer.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0223-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0224-lirc-rpi-Remove-in-favour-of-gpio-ir.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0225-media-bcm2835-unicam-Pass-through-the-colorspace-on-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0226-media-tc358743-Return-an-appropriate-colorspace-from.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0227-staging-bcm2835-camera-fix-module-autoloading.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0228-staging-bcm2835-camera-Move-module-info-to-the-end.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0230-staging-vchiq_arm-Fix-camera-device-registration.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0231-staging-vchiq_arm-Register-a-platform-device-for-the.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0232-staging-bcm2835-audio-Enable-compile-test.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0233-staging-bcm2835-audio-use-module_platform_driver-mac.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0234-staging-bcm2835-audio-Drop-DT-dependency.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0235-staging-bcm2835-camera-Provide-more-specific-probe-e.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0236-staging-bcm2835-camera-Add-hint-about-possible-fault.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0237-staging-bcm2835-Don-t-probe-if-no-camera-is-detected.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0238-staging-vchiq_arm-Improve-error-handling-on-loading-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0239-staging-bcm2835-camera-Do-not-bulk-receive-from-serv.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0241-staging-bcm2835-camera-Correctly-denote-key-frames-i.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0242-staging-bcm2835-camera-Return-early-on-errors.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0243-staging-bcm2835-camera-Remove-dead-email-addresses.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0244-staging-bcm2835-camera-Fix-comment-style-violations.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0245-staging-bcm2835-camera-Fix-spacing-around-operators.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0246-staging-bcm2835-camera-Reduce-length-of-enum-names.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0247-staging-bcm2835-camera-Fix-multiple-line-dereference.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0248-staging-bcm2835-camera-Fix-brace-style-issues.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0249-staging-bcm2835-camera-Fix-missing-lines-between-ite.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0250-staging-bcm2835-camera-Fix-logical-continuation-spli.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0251-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch4
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0252-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch44
-rw-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0253-staging-bcm2835-camera-Remove-check-of-the-number-of.patch44
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0254-staging-bcm2835-camera-Handle-empty-EOS-buffers-whil.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0255-staging-bcm2835-camera-Set-sequence-number-correctly.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0256-staging-bcm2835-camera-Ensure-timestamps-never-go-ba.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0257-staging-bcm2835-camera-Avoid-unneeded-internal-decla.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0258-staging-bcm2835-camera-Add-multiple-inclusion-protec.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0259-staging-bcm2835-camera-Unify-header-inclusion-define.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0260-ARM-bcm2835_defconfig-Enable-bcm2835-camera.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0261-staging-bcm2835-camera-Fix-alignment-should-match-op.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0262-staging-bcm2835-camera-Fix-multiple-assignments-shou.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0263-staging-bcm2835-camera-Fix-up-all-formatting-in-mmal.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0264-staging-bcm2835-camera-Use-enums-for-max-value-in-co.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0265-staging-bcm2835-camera-Correct-V4L2_CID_COLORFX_CBCR.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0266-staging-bcm2835-camera-Remove-amend-some-obsolete-co.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0267-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0268-staging-mmal-vchiq-Allocate-and-free-components-as-r.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0269-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0270-staging-mmal-vchiq-Make-timeout-a-defined-parameter.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0271-staging-mmal-vchiq-Make-a-mmal_buf-struct-for-passin.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0272-staging-mmal-vchiq-Add-support-for-event-callbacks.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0273-staging-vc04_services-Support-sending-data-to-MMAL-p.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0274-staging-vc04_services-Fixup-vchiq-mmal-include-order.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0275-staging-vc04_services-Add-new-vc-sm-cma-driver.patch13
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0276-staging-vc-sm-cma-Fixup-driver-for-older-VCHI-APIs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0277-staging-vc04_services-Use-vc-sm-cma-to-support-zero-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0278-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0279-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0280-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0281-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0282-ARM-bcm2835_defconfig-Enable-bcm2835-codec.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0283-config-Add-bcm2835-codec-to-Pi-defconfigs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0284-staging-bcm2835-camera-Fix-stride-on-RGB3-BGR3-forma.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0285-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0286-tpm-Make-SECURITYFS-a-weak-dependency.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0287-Enable-TPM-TIS-SPI-support-for-TPM1.2-and-TPM2.0-chi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0288-Add-overlay-for-SLB9760-Iridium-LetsTrust-TPM.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0289-Revert-staging-vchiq_arm-Register-a-platform-device-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0290-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0291-ASoC-add-driver-for-3Dlab-Nano-soundcard-2758.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0292-overlays-Update-README-with-removal-of-lirc-rpi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0293-staging-bcm2835-camera-Check-the-error-for-REPEAT_SE.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0294-gpio-ir-change-default-pull-configuration-to-up.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0295-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0296-firmware-raspberrypi-Report-the-fw-git-hash-during-p.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0297-arm64-dts-broadcom-Enable-fixups-for-overlays.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0298-sc16is7xx-Fix-for-Unexpected-interrupt-8.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0299-dtoverlays-fe-pi-audio-fix-sgtl5000-compatible-strin.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0300-bcm2835_smi-re-add-dereference-to-fix-DMA-transfers.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0301-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0302-ASoC-Add-support-for-AudioSense-Pi-add-on-soundcard.patch13
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0303-BCM270X-Adding-device-tree-support-for-AudioSense-Pi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0304-configs-Add-CONFIG_SND_AUDIOSENSE_PI-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0305-configs-Add-CONFIG_USB_TMC-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0306-overlays-sdio-Add-enhanced-1-bit-support.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0307-dwc_otg-fix-bug-with-port_addr-assignment-for-single.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0308-configs-Add-CONFIG_USB_UAS-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0309-Added-driver-for-the-HiFiBerry-DAC-ADC-2694.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0310-Revert-pwm-Set-class-for-exported-channels-in-sysfs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0311-pwm-Send-a-uevent-on-the-pwmchip-device-upon-channel.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0312-usb-dwc2-Disable-all-EP-s-on-disconnect.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0313-usb-dwc2-Fix-disable-all-EP-s-on-disconnect.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0314-overlays-Add-ssd1306-overlay-for-OLED-display.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0315-overlays-mcp23017-Support-the-MCP23008.patch20
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0316-overlays-Add-mcp342x-overlay.patch13
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0317-char-vcio-Add-compat-ioctl-handling.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0318-char-vcio-Fail-probe-if-rpi_firmware-is-not-found.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0319-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0320-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0321-staging-bcm2835-camera-Set-the-field-value-within-ea.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0322-char-vc_mem-Fix-up-compat-ioctls-for-64bit-kernel.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0323-char-vc_mem-Fix-all-coding-style-issues.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0324-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0325-mfd-Add-rpi_sense_core-of-compatible-string.patch6
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0326-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0327-input-rpi-ft5406-Clear-build-warning-on-64-bit-build.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0328-dtoverlays-Correct-DT-handling-camera-GPIOs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0329-media-ov5647-Use-gpiod_set_value_cansleep.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0330-media-bcm2835-unicam-Power-on-subdev-on-open-release.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0331-audioinjector-octo-revert-to-dummy-supplies.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0332-staging-bcm2835-camera-Correct-ctrl-min-max-step-def.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0333-staging-bcm2835-codec-variable-vb2-may-be-used-unini.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0334-staging-bcm2835-codec-Fix-potentially-uninitialised-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0335-video-bcm2708_fb-Add-compat_ioctl-support.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0336-video-bcm2708_fb-Fix-warnings-on-64-bit-builds.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0337-video-bcm2708_fb-Clean-up-coding-style-issues.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0338-bcm2835-dma-Add-support-for-per-channel-flags.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0339-bcm283x-Set-the-DISDEBUG-flag-for-SD-transfers.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0340-ASoC-pcm512x-Implement-the-digital_mute-interface.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0341-ASoC-pcm512x-Fix-a-double-unlock-in-pcm512x_digital_.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0342-usb-dwc_otg-Clean-up-build-warnings-on-64bit-kernels.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0343-usb-dwc_otg-Use-dma-allocation-for-mphi-dummy_send-b.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0344-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0345-staging-vc-sm-cma-Correct-DMA-configuration.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0346-staging-vc-sm-cma-Use-a-void-pointer-as-the-handle-w.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0347-staging-vc-sm-cma-Fix-up-for-64bit-builds.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0348-configs-Add-Unicam-and-subdevices-to-bcmrpi3_defconf.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0349-configs-Add-VIDEO_BCM2835-to-bcmrpi3_defconfig.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0350-configs-Add-V4L2-codec-driver-to-bcmrpi3_defconfig.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0351-config-Add-IPVLAN-module-to-bcmrpi3_defconfig.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0352-configs-Enable-the-AD193x-codecs.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0353-overlays-balenaFin-v1.1.0-carrier-board-update.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0354-configs-Add-CONFIG_LEDS_PCA963X-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0355-Revert-brcmfmac-Mute-expected-startup-errors.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0356-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0357-drm-vc4-Programming-the-CTM-is-conditional-on-runnin.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0358-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0359-staging-mmal-vchiq-Always-return-the-param-size-from.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0360-staging-mmal-vchiq-If-the-VPU-returns-an-error-don-t.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0361-staging-bcm2835_codec-Query-supported-formats-from-t.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0362-staging-bcm2835_codec-Add-support-for-the-ISP-as-an-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0363-staging-bcm2835_codec-Add-an-option-for-ignoring-Bay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0364-staging-bcm2835_codec-Fix-handling-of-VB2_MEMORY_DMA.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0365-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0366-staging-bcm2835_codec-Include-timing-info-in-SPS-hea.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0367-drm-vc4-Don-t-wait-for-vblank-on-fkms-cursor-updates.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0368-Fix-for-Pisound-kernel-module-in-Real-Time-kernel-co.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0369-config-Add-CONFIG_FB_TFT_SH1106-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0370-Added-mute-stream-func.patch4
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0371-lan78xx-EEE-support-is-now-a-PHY-property.patch44
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0372-video-bcm2708_fb-Try-allocating-on-the-ARM-and-passi.patch44
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0373-staging-vc_sm_cma-Remove-erroneous-misc_deregister.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0374-vcsm-Fix-makefile-include-on-out-of-tree-builds.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0375-vcsm-Remove-set-but-unused-variable.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0376-vcsm-Reduce-scope-of-local-functions.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0377-staging-bcm2835-codec-NULL-component-handle-on-queue.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0378-staging-vc-sm-cma-Remove-the-debugfs-directory-on-re.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0379-staging-vc-sm-cma-Use-devm_-allocs-for-sm_state.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0380-staging-vc-sm-cma-Don-t-fail-if-debugfs-calls-fail.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0381-staging-vc-sm-cma-Ensure-mutex-and-idr-are-destroyed.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0382-staging-bcm2835_codec-Clean-up-logging-on-unloading-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0383-configs-Enable-MT76-USB-wifi.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0384-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0385-overlays-sdio-Added-4-bit-support-on-GPIOs-34-39.-29.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0386-overlays-Fix-multiple-instantiation-of-sc16is7xx.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0387-configs-Re-enable-CONFIG_NETFILTER_XT_MATCH_SOCKET.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0388-bcm2835-mmc-Fix-DMA-channel-leak.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0389-bcm2835-mmc-Fix-struct-mmc_host-leak-on-probe.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0390-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0391-bcm2835-mmc-Handle-mmc_add_host-errors.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0392-bcm2835-mmc-Deduplicate-reset-of-driver-data-on-remo.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0393-configs-Add-CONFIG_BATTERY_MAX17040.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0394-overlays-Add-max17040-support-to-i2c-sensor.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0395-defconfigs-disable-memory-and-IO-cgroups-2908.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0396-media-bcm2835-unicam-Add-support-for-enum-framesizes.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0397-staging-bcm2835-codec-Refactor-default-resolution-co.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0398-nvmem-add-type-attribute.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0399-rtc-rv3028-add-new-driver.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0400-configs-Add-RTC_DRV_RV3028-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0401-overlays-Add-rv3028-to-i2c-rtc.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0402-ASoC-tlv320aic32x4-SND_SOC_DAPM_MICBIAS-is-deprecate.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0403-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0404-ASoC-tlv320aic32x4-Properly-Set-Processing-Blocks.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0405-ASoC-tlv320aic32x4-Model-PLL-in-CCF.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0406-ASoC-tlv320aic32x4-Model-CODEC_CLKIN-in-CCF.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0407-ASoC-tlv320aic32x4-Model-DAC-ADC-dividers-in-CCF.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0408-ASoC-tlv320aic32x4-Model-BDIV-divider-in-CCF.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0409-ASoC-tlv320aic32x4-Control-clock-gating-with-CCF.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0410-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0411-ASoC-tlv320aic32x4-Dynamically-Determine-Clocking.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0412-ASoC-tlv320aic32x4-Restructure-set_dai_sysclk.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0413-ASoC-tlv320aic32x4-Remove-mclk-references.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0414-ASoC-tlv320aic32x4-Allow-192000-Sample-Rate.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0415-ASoC-tlv320aic32x4-Only-enable-with-common-clock.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0416-Audiophonics-I-Sabre-9038Q2M-DAC-driver.patch8
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0417-ASoC-tlv320aic32x4-Change-author-s-name.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0418-ASoC-tlv320aic32x4-Update-copyright-and-use-SPDX-ide.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0419-ASoC-tlv320aic32x4-Add-Switch-for-Setting-Common-Mod.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0420-ASoC-tlv320aic32x4-Add-Playback-PowerTune-Controls.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0421-dtoverlays-Add-Support-for-the-UDRC-DRAWS.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0422-dwc_otg-only-do_split-when-we-actually-need-to-do-a-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0423-Input-ili210x-fetch-touchscreen-geometry-from-DT.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0424-Input-ili210x-add-DT-binding-document.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0425-configs-Add-TOUCHSCREEN_ILI210X-m.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0426-BCM2708-Add-core-Device-Tree-support-ilitek251x.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0427-dwc_otg-fix-locking-around-dequeueing-and-killing-UR.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0428-rtc-rv3028-Add-backup-switchover-mode-support.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0429-dt-bindings-rv3028-backup-switchover-support.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0430-overlays-Add-rv3028-backup-switchover-support-to-i2c.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0431-Maxim-MAX98357A-I2S-DAC-overlay-2935.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0432-media-m88ds3103-serialize-reset-messages-in-m88ds310.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0433-sound-Fixes-for-audioinjector-octo-under-4.19.patch6
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0434-Revert-cgroup-Disable-cgroup-memory-by-default.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0435-Revert-defconfigs-disable-memory-and-IO-cgroups-2908.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0436-overlays-Add-PiGlow-overlay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0437-configs-enable-LED-driver-for-PiGlow.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0438-Revert-bcm2835-interpolate-audio-delay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0439-Revert-staging-bcm2835-audio-Enable-compile-test.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0440-Revert-staging-bcm2835-audio-use-module_platform_dri.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0441-staging-bcm2835-audio-Clean-up-mutex-locks.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0442-staging-bcm2835-audio-Remove-redundant-spdif-stream-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0443-staging-bcm2835-audio-Clean-up-include-files-in-bcm2.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0444-staging-bcm2835-audio-Remove-redundant-substream-mas.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0445-staging-bcm2835-audio-Fix-mute-controls-volume-handl.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0446-staging-bcm2835-audio-Remove-redundant-function-call.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0447-staging-bcm2835-audio-Remove-superfluous-open-flag.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0448-staging-bcm2835-audio-Drop-useless-running-flag-and-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0449-staging-bcm2835-audio-Fix-incorrect-draining-handlin.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0450-staging-bcm2835-audio-Kill-unused-spinlock.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0451-staging-bcm2835-audio-Use-PCM-runtime-values-instead.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0452-staging-bcm2835-audio-Drop-unnecessary-pcm-indirect-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0453-staging-bcm2835-audio-Drop-useless-NULL-check.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0454-staging-bcm2835-audio-Propagate-parameter-setup-erro.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0455-staging-bcm2835-audio-Drop-debug-messages-in-bcm2835.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0456-staging-bcm2835-audio-Drop-superfluous-mutex-lock-du.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0457-staging-bcm2835-audio-Add-10ms-period-constraint.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0458-staging-bcm2835-audio-Make-single-vchi-handle.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0459-staging-bcm2835-audio-Code-refactoring-of-vchiq-acce.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0460-staging-bcm2835-audio-Operate-non-atomic-PCM-ops.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0461-staging-bcm2835-audio-Use-card-private_data.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0462-staging-bcm2835-audio-Use-standard-error-print-helpe.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0463-staging-bcm2835-audio-Remove-unnecessary-header-file.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0464-staging-bcm2835-audio-Move-module-parameter-descript.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0465-staging-bcm2835-audio-Use-coherent-device-buffers.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0466-staging-bcm2835-audio-Set-SNDRV_PCM_INFO_SYNC_APPLPT.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0467-staging-bcm2835-audio-Simplify-PCM-creation-helpers.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0468-staging-bcm2835-audio-Simplify-kctl-creation-helpers.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0469-staging-bcm2835-audio-Simplify-card-object-managemen.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0470-staging-bcm2835-audio-unify-FOURCC-command-definitio.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0471-staging-bcm2835-audio-don-t-initialize-memory-twice.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0472-staging-bcm2835-audio-reorder-variable-declarations-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0473-staging-bcm2835-audio-use-anonymous-union-in-struct-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0474-staging-bcm2835-audio-more-generic-probe-function-na.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0475-staging-bcm2835-audio-rename-platform_driver-structu.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0476-staging-bcm2835-audio-update-TODO.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0477-staging-bcm2835-audio-interpolate-audio-delay.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0478-staging-bcm2835-audio-Enable-compile-test.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0479-staging-bcm2835-audio-use-module_platform_driver-mac.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0480-staging-bcm2835-audio-Drop-DT-dependency.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0481-staging-bcm2835-audio-double-free-in-init-error-path.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0482-dts-Increase-default-coherent-pool-size.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0483-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0484-configs-Enable-netdev-LED-trigger.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0485-smsc95xx-dynamically-fix-up-TX-buffer-alignment-with.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0486-lan78xx-use-default-alignment-for-rx-buffers.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0487-staging-bcm2835-codec-Correct-port-width-calc-for-tr.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0488-staging-bcm2835-codec-Remove-height-padding-for-ISP-.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0489-staging-mmal-vchiq-Free-the-event-context-for-contro.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0490-staging-mmal-vchiq-Replace-spinlock-protecting-conte.patch4
--rw-r--r--'>sys-kernel/boest-v4.19.42/raspberrypi/0491-BCM270X_DT-Also-set-coherent_pool-1M-for-BT-Pis.patch44
--rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0492-configs-Enable-ICS-43432-I2S-microphone-module.patch44
--rw-r--r--r--sys-kernel/boest-v4.19.42/raspberrypi/0493-arm-dts-overlays-rpi-sense-add-upstream-humidity-com.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0494-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0495-staging-vchiq-mmal-Fix-memory-leak-of-vchiq-instance.patch4
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0496-Revert-video-bcm2708_fb-Try-allocating-on-the-ARM-an.patch168
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0497-Added-IQaudIO-Pi-Codec-board-support-2969.patch427
-rw-r--r--sys-kernel/boest-v4.19.42/raspberrypi/0498-Revert-smsc95xx-dynamically-fix-up-TX-buffer-alignme.patch64
-rw-r--r--sys-kernel/boest-v4.19.43/0001-patch-4.19-ja1.diff.patch2127
-rw-r--r--sys-kernel/boest-v4.19.43/0002-pool-2.6.25-tcp-timewait-20s.diff.patch27
-rw-r--r--sys-kernel/boest-v4.19.43/0003-pool-2.6.25-disable-tcp-debug.diff.patch25
-rw-r--r--sys-kernel/boest-v4.19.43/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch142
-rw-r--r--sys-kernel/boest-v4.19.43/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch34
-rw-r--r--sys-kernel/boest-v4.19.43/0006-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch45
-rw-r--r--sys-kernel/boest-v4.19.43/0007-This-patch-adds-support-for-a-restricted-user-contro.patch75
-rw-r--r--sys-kernel/boest-v4.19.43/0008-fs-Enable-link-security-restrictions-by-default.patch26
-rw-r--r--sys-kernel/boest-v4.19.43/0009-usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch37
-rw-r--r--sys-kernel/boest-v4.19.43/0010-4.19-2600_enable-key-swapping-for-apple-mac.patch.patch125
-rw-r--r--sys-kernel/boest-v4.19.43/0011-4.19-4200_fbcondecor.patch.patch2119
-rw-r--r--sys-kernel/boest-v4.19.43/0012-4.19-4400_alpha-sysctl-uac.patch.patch153
-rw-r--r--sys-kernel/boest-v4.19.43/0013-4.19-4567_distro-Gentoo-Kconfig.patch.patch173
-rw-r--r--sys-kernel/boest-v4.19.43/0014-WARNING-This-patch-works-with-gcc-versions-4.9-and-w.patch565
l---------sys-kernel/longterm-sources-4.19.431
513 files changed, 20081 insertions, 13975 deletions
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
index 9ebba129..f3c829e8 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
@@ -1,7 +1,7 @@
-From abb5e36984168de9bf1558f6d9babe2aaf2b2b55 Mon Sep 17 00:00:00 2001
+From 6a3017550748a30572c41e0401b108bc8eac3822 Mon Sep 17 00:00:00 2001
From: Dan Pasanen <dan.pasanen@gmail.com>
Date: Thu, 21 Sep 2017 09:55:42 -0500
-Subject: [PATCH 001/495] arm: partially revert
+Subject: [PATCH 001/498] arm: partially revert
702b94bff3c50542a6e4ab9a4f4cef093262fe65
* Re-expose some dmi APIs for use in VCSM
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0002-smsx95xx-fix-crimes-against-truesize.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0002-smsx95xx-fix-crimes-against-truesize.patch
index 8d065eb0..23489fb6 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0002-smsx95xx-fix-crimes-against-truesize.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0002-smsx95xx-fix-crimes-against-truesize.patch
@@ -1,7 +1,7 @@
-From 22f6791836b13cef9a3c75c7ba0302183c198926 Mon Sep 17 00:00:00 2001
+From db3c229d548e362138e5a945d0e2a5990008a661 Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Thu, 19 Feb 2015 18:47:12 +0000
-Subject: [PATCH 002/495] smsx95xx: fix crimes against truesize
+Subject: [PATCH 002/498] smsx95xx: fix crimes against truesize
smsc95xx is adjusting truesize when it shouldn't, and following a recent patch from Eric this is now triggering warnings.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
index 3ec3a184..86a160e4 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0003-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
@@ -1,7 +1,7 @@
-From 053ce6235dd9d2b7d6f0a0f930abdf01386ae75d Mon Sep 17 00:00:00 2001
+From 051e58f2a6b4e108ef51189c7f7ffff6474d11d7 Mon Sep 17 00:00:00 2001
From: Sam Nazarko <email@samnazarko.co.uk>
Date: Fri, 1 Apr 2016 17:27:21 +0100
-Subject: [PATCH 003/495] smsc95xx: Experimental: Enable turbo_mode and
+Subject: [PATCH 003/498] smsc95xx: Experimental: Enable turbo_mode and
packetsize=2560 by default
See: http://forum.kodi.tv/showthread.php?tid=285288
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0004-Allow-mac-address-to-be-set-in-smsc95xx.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0004-Allow-mac-address-to-be-set-in-smsc95xx.patch
index 68055e35..432b2950 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0004-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0004-Allow-mac-address-to-be-set-in-smsc95xx.patch
@@ -1,7 +1,7 @@
-From b7eb26560f5a9c054fa4bea633d241d8e1d46283 Mon Sep 17 00:00:00 2001
+From f167d2a41a5f58215bd17c36b92c74beb156ea92 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 26 Mar 2013 17:26:38 +0000
-Subject: [PATCH 004/495] Allow mac address to be set in smsc95xx
+Subject: [PATCH 004/498] Allow mac address to be set in smsc95xx
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0005-Protect-__release_resource-against-resources-without.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0005-Protect-__release_resource-against-resources-without.patch
index a9386b9c..49a2f7d9 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0005-Protect-__release_resource-against-resources-without.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0005-Protect-__release_resource-against-resources-without.patch
@@ -1,7 +1,7 @@
-From 0e905550c3a8c9c2510387f3345a05082cc96c42 Mon Sep 17 00:00:00 2001
+From fb8eb666ecabcf4ef1894c6d83edce8d96cf7e91 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 13 Mar 2015 12:43:36 +0000
-Subject: [PATCH 005/495] Protect __release_resource against resources without
+Subject: [PATCH 005/498] Protect __release_resource against resources without
parents
Without this patch, removing a device tree overlay can crash here.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch
index 880f4490..23075df0 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0006-irq-bcm2836-Prevent-spurious-interrupts-and-trap-the.patch
@@ -1,7 +1,7 @@
-From 5b082cfc272d6697c8fee566515b975e41d147ca Mon Sep 17 00:00:00 2001
+From c230a83e35f7eab19e7e6e19da7fd55bf8a1cdb1 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 4 Dec 2015 17:41:50 +0000
-Subject: [PATCH 006/495] irq-bcm2836: Prevent spurious interrupts, and trap
+Subject: [PATCH 006/498] irq-bcm2836: Prevent spurious interrupts, and trap
them early
The old arch-specific IRQ macros included a dsb to ensure the
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
index c9403712..0c6fb7a2 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0007-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
@@ -1,7 +1,7 @@
-From 825e44e94e903bd8e3cdc1fe8011cb88fb6711f8 Mon Sep 17 00:00:00 2001
+From dcece3efebff8ab1efbdbd7af2042fefc92f2bcf Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 9 Feb 2017 14:33:30 +0000
-Subject: [PATCH 007/495] irq-bcm2836: Avoid "Invalid trigger warning"
+Subject: [PATCH 007/498] irq-bcm2836: Avoid "Invalid trigger warning"
Initialise the level for each IRQ to avoid a warning from the
arm arch timer code.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0008-irqchip-bcm2835-Add-FIQ-support.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0008-irqchip-bcm2835-Add-FIQ-support.patch
index 94d9e631..02db03c0 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0008-irqchip-bcm2835-Add-FIQ-support.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0008-irqchip-bcm2835-Add-FIQ-support.patch
@@ -1,7 +1,7 @@
-From 1b94a09c1c8ef0b9a74d6d88bb9bc26a2bf0c774 Mon Sep 17 00:00:00 2001
+From d682e0c5f97dfe1db6440314f6c1b5da1f5dcef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 12 Jun 2015 19:01:05 +0200
-Subject: [PATCH 008/495] irqchip: bcm2835: Add FIQ support
+Subject: [PATCH 008/498] irqchip: bcm2835: Add FIQ support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
index 3af30b78..4351f6cf 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
@@ -1,7 +1,7 @@
-From 06441c50ace604032c42ac2a5556c1383790421e Mon Sep 17 00:00:00 2001
+From 1e6d871db03be07a9940213094f9c3ebf525a3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 23 Oct 2015 16:26:55 +0200
-Subject: [PATCH 009/495] irqchip: irq-bcm2835: Add 2836 FIQ support
+Subject: [PATCH 009/498] irqchip: irq-bcm2835: Add 2836 FIQ support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch
index acbe4bc2..34c2bcda 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0010-spidev-Add-spidev-compatible-string-to-silence-warni.patch
@@ -1,7 +1,7 @@
-From 0be7384f81bc045e141e77f834e4b52d597e7cf3 Mon Sep 17 00:00:00 2001
+From eaadea00f732c61962ae29fa32fb5c36e00668ca Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 14 Jul 2015 10:26:09 +0100
-Subject: [PATCH 010/495] spidev: Add "spidev" compatible string to silence
+Subject: [PATCH 010/498] spidev: Add "spidev" compatible string to silence
warning
See: https://github.com/raspberrypi/linux/issues/1054
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch
index 5a6f69ba..a6003904 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0011-spi-bcm2835-Support-pin-groups-other-than-7-11.patch
@@ -1,7 +1,7 @@
-From be09e328382be5822805eb49fc702e7ab0597e36 Mon Sep 17 00:00:00 2001
+From 0cf6b86f95996675d3ba954bfaa351e2a92118c2 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 24 Jun 2015 14:10:44 +0100
-Subject: [PATCH 011/495] spi-bcm2835: Support pin groups other than 7-11
+Subject: [PATCH 011/498] spi-bcm2835: Support pin groups other than 7-11
The spi-bcm2835 driver automatically uses GPIO chip-selects due to
some unreliability of the native ones. In doing so it chooses the
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0012-spi-bcm2835-Disable-forced-software-CS.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0012-spi-bcm2835-Disable-forced-software-CS.patch
index fd9bced3..b8002757 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0012-spi-bcm2835-Disable-forced-software-CS.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0012-spi-bcm2835-Disable-forced-software-CS.patch
@@ -1,7 +1,7 @@
-From 7f5a88e2d356037627e9ad98a979f6753045719d Mon Sep 17 00:00:00 2001
+From 3f48e105a08b16ad1842eac09108ef0494295c37 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 1 Jul 2016 22:09:24 +0100
-Subject: [PATCH 012/495] spi-bcm2835: Disable forced software CS
+Subject: [PATCH 012/498] spi-bcm2835: Disable forced software CS
Select software CS in bcm2708_common.dtsi, and disable the automatic
conversion in the driver to allow hardware CS to be re-enabled with an
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0013-spi-bcm2835-Remove-unused-code.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0013-spi-bcm2835-Remove-unused-code.patch
index 5848e15c..1fd4a4e9 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0013-spi-bcm2835-Remove-unused-code.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0013-spi-bcm2835-Remove-unused-code.patch
@@ -1,7 +1,7 @@
-From ce2802b1b74e539836552e125c5f1f9f288d8c2e Mon Sep 17 00:00:00 2001
+From e7e51371dc0597956c6ee67f551184d757c80869 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 8 Nov 2016 21:35:38 +0000
-Subject: [PATCH 013/495] spi-bcm2835: Remove unused code
+Subject: [PATCH 013/498] spi-bcm2835: Remove unused code
---
drivers/spi/spi-bcm2835.c | 61 ---------------------------------------
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
index 751d2cf8..d6781458 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0014-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
@@ -1,7 +1,7 @@
-From 556942b9d52c7998ee1b3063f4c8e9b2074a975f Mon Sep 17 00:00:00 2001
+From 0623251e25aaac7e7f2aafbcb82db6ecfb145ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Sat, 3 Oct 2015 22:22:55 +0200
-Subject: [PATCH 014/495] dmaengine: bcm2835: Load driver early and support
+Subject: [PATCH 014/498] dmaengine: bcm2835: Load driver early and support
legacy API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0015-firmware-Updated-mailbox-header.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0015-firmware-Updated-mailbox-header.patch
index 75c7d75f..d986a722 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0015-firmware-Updated-mailbox-header.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0015-firmware-Updated-mailbox-header.patch
@@ -1,7 +1,7 @@
-From 23cf2182f7e16d9f29050650b6386fa4d9c26642 Mon Sep 17 00:00:00 2001
+From c5b16ce9b85ed3af12514003b253cea3dd043305 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 25 Jan 2016 17:25:12 +0000
-Subject: [PATCH 015/495] firmware: Updated mailbox header
+Subject: [PATCH 015/498] firmware: Updated mailbox header
---
include/soc/bcm2835/raspberrypi-firmware.h | 5 +++++
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch
index de94ce03..ab4562cf 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0016-rtc-Add-SPI-alias-for-pcf2123-driver.patch
@@ -1,7 +1,7 @@
-From cdd69f08d9248d30c527776a21719cd38c4f8761 Mon Sep 17 00:00:00 2001
+From 88ba1ae1a154399d13addcd28d0d6286c4e4e617 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 15 Jun 2016 16:48:41 +0100
-Subject: [PATCH 016/495] rtc: Add SPI alias for pcf2123 driver
+Subject: [PATCH 016/498] rtc: Add SPI alias for pcf2123 driver
Without this alias, Device Tree won't cause the driver
to be loaded.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0017-watchdog-bcm2835-Support-setting-reboot-partition.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0017-watchdog-bcm2835-Support-setting-reboot-partition.patch
index c9ae9658..ddf6a2c5 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0017-watchdog-bcm2835-Support-setting-reboot-partition.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0017-watchdog-bcm2835-Support-setting-reboot-partition.patch
@@ -1,7 +1,7 @@
-From b9229e0f6d0dd9ca36e46e9c8e3fb956421c8ffb Mon Sep 17 00:00:00 2001
+From c02291c0becb3437c1753bab6aab8849cd536e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 7 Oct 2016 16:50:59 +0200
-Subject: [PATCH 017/495] watchdog: bcm2835: Support setting reboot partition
+Subject: [PATCH 017/498] watchdog: bcm2835: Support setting reboot partition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
index 8ca0e1a6..39d8c60e 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0018-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
@@ -1,7 +1,7 @@
-From 612794c060b7ecb4d0597914934cadd3ea71e68b Mon Sep 17 00:00:00 2001
+From 378b5ab00e03806126a0b6285ba4ed799d94aca1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 5 Apr 2016 19:40:12 +0100
-Subject: [PATCH 018/495] reboot: Use power off rather than busy spinning when
+Subject: [PATCH 018/498] reboot: Use power off rather than busy spinning when
halt is requested
---
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
index c0f52652..c198b680 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0019-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
@@ -1,7 +1,7 @@
-From ec947e6c1d9b63f277dc83b95c1e3431f9a10729 Mon Sep 17 00:00:00 2001
+From caa3100fb0f42c711d665c1846bb550e899be70a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 9 Nov 2016 13:02:52 +0000
-Subject: [PATCH 019/495] bcm: Make RASPBERRYPI_POWER depend on PM
+Subject: [PATCH 019/498] bcm: Make RASPBERRYPI_POWER depend on PM
---
drivers/soc/bcm/Kconfig | 1 +
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0020-Register-the-clocks-early-during-the-boot-process-so.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0020-Register-the-clocks-early-during-the-boot-process-so.patch
index 15ab87ce..52e58ca7 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0020-Register-the-clocks-early-during-the-boot-process-so.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0020-Register-the-clocks-early-during-the-boot-process-so.patch
@@ -1,7 +1,7 @@
-From bf27c016c7cad8e33599c005efaf8581e0993d07 Mon Sep 17 00:00:00 2001
+From cda79971bbafba5816abf0c9f359b0da0e457874 Mon Sep 17 00:00:00 2001
From: Martin Sperl <kernel@martin.sperl.org>
Date: Fri, 2 Sep 2016 16:45:27 +0100
-Subject: [PATCH 020/495] Register the clocks early during the boot process, so
+Subject: [PATCH 020/498] Register the clocks early during the boot process, so
that special/critical clocks can get enabled early on in the boot process
avoiding the risk of disabling a clock, pll_divider or pll when a claiming
driver fails to install propperly - maybe it needs to defer.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
index 1c3fef51..ddf1b741 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0021-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
@@ -1,7 +1,7 @@
-From 84b1a6390023a4576b75e62007fe337aa65a55b5 Mon Sep 17 00:00:00 2001
+From e2f55b320f0f3ec64edb5b136d168a55fda2c87e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 6 Dec 2016 17:05:39 +0000
-Subject: [PATCH 021/495] bcm2835-rng: Avoid initialising if already enabled
+Subject: [PATCH 021/498] bcm2835-rng: Avoid initialising if already enabled
Avoids the 0x40000 cycles of warmup again if firmware has already used it
---
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch
index 8698b53d..84898308 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0022-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch
@@ -1,7 +1,7 @@
-From e728c2d3a53104366d9a3c5f430615319d4b2d8f Mon Sep 17 00:00:00 2001
+From 7a195697e2aad2f640b6ee1b8c26486b5d3de7e2 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 24 Aug 2016 16:28:44 +0100
-Subject: [PATCH 022/495] kbuild: Ignore dtco targets when filtering symbols
+Subject: [PATCH 022/498] kbuild: Ignore dtco targets when filtering symbols
---
scripts/Kbuild.include | 2 +-
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
index cf67b905..ec5a2089 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
@@ -1,7 +1,7 @@
-From c860adc2aeb566df556f5637707f43b270a8c815 Mon Sep 17 00:00:00 2001
+From ba220c17d89c223862988594c893db61198910be Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 13 Feb 2017 17:20:08 +0000
-Subject: [PATCH 023/495] clk-bcm2835: Mark used PLLs and dividers CRITICAL
+Subject: [PATCH 023/498] clk-bcm2835: Mark used PLLs and dividers CRITICAL
The VPU configures and relies on several PLLs and dividers. Mark all
enabled dividers and their PLLs as CRITICAL to prevent the kernel from
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0024-clk-bcm2835-Add-claim-clocks-property.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0024-clk-bcm2835-Add-claim-clocks-property.patch
index a4aeb880..45a28c2a 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0024-clk-bcm2835-Add-claim-clocks-property.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0024-clk-bcm2835-Add-claim-clocks-property.patch
@@ -1,7 +1,7 @@
-From 811c68ed99e6d379d7a05a8d93e9943f4b6cf6f1 Mon Sep 17 00:00:00 2001
+From 20ddbf84c11ec7a19b9df55fb112e25c693df8ff Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 13 Feb 2017 17:20:08 +0000
-Subject: [PATCH 024/495] clk-bcm2835: Add claim-clocks property
+Subject: [PATCH 024/498] clk-bcm2835: Add claim-clocks property
The claim-clocks property can be used to prevent PLLs and dividers
from being marked as critical. It contains a vector of clock IDs,
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch
index c1c08c90..a3ce663e 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch
@@ -1,7 +1,7 @@
-From b1c0eece1c577411b1db0aaf5a9aeeac32b44c5a Mon Sep 17 00:00:00 2001
+From d241d35a6e870092259cc66103713f02ab47b96e Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 6 Mar 2017 09:06:18 +0000
-Subject: [PATCH 025/495] clk-bcm2835: Read max core clock from firmware
+Subject: [PATCH 025/498] clk-bcm2835: Read max core clock from firmware
The VPU is responsible for managing the core clock, usually under
direction from the bcm2835-cpufreq driver but not via the clk-bcm2835
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
index f0fcb6e2..1fad2f52 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0026-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
@@ -1,7 +1,7 @@
-From 8b15504f32a67c1692be81e0008b9a016d318fc1 Mon Sep 17 00:00:00 2001
+From fb760fbe9286af55eeaf088e3c891e13350995c9 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 9 May 2016 17:28:18 -0700
-Subject: [PATCH 026/495] clk: bcm2835: Mark GPIO clocks enabled at boot as
+Subject: [PATCH 026/498] clk: bcm2835: Mark GPIO clocks enabled at boot as
critical.
These divide off of PLLD_PER and are used for the ethernet and wifi
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0027-sound-Demote-deferral-errors-to-INFO-level.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0027-sound-Demote-deferral-errors-to-INFO-level.patch
index 6a15af55..4d7dca88 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0027-sound-Demote-deferral-errors-to-INFO-level.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0027-sound-Demote-deferral-errors-to-INFO-level.patch
@@ -1,7 +1,7 @@
-From beb4df4ebaee2eca1453034522e5778098b5c85b Mon Sep 17 00:00:00 2001
+From cac1dffb87fe2fb81ab24274855e93b37dd3e6d5 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 9 Feb 2017 14:36:44 +0000
-Subject: [PATCH 027/495] sound: Demote deferral errors to INFO level
+Subject: [PATCH 027/498] sound: Demote deferral errors to INFO level
At present there is no mechanism to specify driver load order,
which can lead to deferrals and repeated retries until successful.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0028-Update-vfpmodule.c.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0028-Update-vfpmodule.c.patch
index 5a9a1ff2..4eed2e8f 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0028-Update-vfpmodule.c.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0028-Update-vfpmodule.c.patch
@@ -1,7 +1,7 @@
-From 5b4b0e8739a62fc2a05043864b61f2ecdb45f6a6 Mon Sep 17 00:00:00 2001
+From 967352c81fcf0721411c7251696d6c709edce34c Mon Sep 17 00:00:00 2001
From: Claggy3 <stephen.maclagan@hotmail.com>
Date: Sat, 11 Feb 2017 14:00:30 +0000
-Subject: [PATCH 028/495] Update vfpmodule.c
+Subject: [PATCH 028/498] Update vfpmodule.c
Christopher Alexander Tobias Schulze - May 2, 2015, 11:57 a.m.
This patch fixes a problem with VFP state save and restore related
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0029-i2c-bcm2835-Add-debug-support.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0029-i2c-bcm2835-Add-debug-support.patch
index 7d0df5d4..42bf15bf 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0029-i2c-bcm2835-Add-debug-support.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0029-i2c-bcm2835-Add-debug-support.patch
@@ -1,7 +1,7 @@
-From faee81ad0af7527e2a8d09057a224b3154b23cd4 Mon Sep 17 00:00:00 2001
+From 6cb3e595d025479809823158a8b3bb52cb5facc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Tue, 1 Nov 2016 15:15:41 +0100
-Subject: [PATCH 029/495] i2c: bcm2835: Add debug support
+Subject: [PATCH 029/498] i2c: bcm2835: Add debug support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0030-mm-Remove-the-PFN-busy-warning.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0030-mm-Remove-the-PFN-busy-warning.patch
index 44f7e9ed..e8b86048 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0030-mm-Remove-the-PFN-busy-warning.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0030-mm-Remove-the-PFN-busy-warning.patch
@@ -1,7 +1,7 @@
-From 3e7429e41fc9c89d95f727a34685966ea51f8a16 Mon Sep 17 00:00:00 2001
+From b14ee763ad887fa8707b2957b096a774997fbb24 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 18 Dec 2014 16:07:15 -0800
-Subject: [PATCH 030/495] mm: Remove the PFN busy warning
+Subject: [PATCH 030/498] mm: Remove the PFN busy warning
See commit dae803e165a11bc88ca8dbc07a11077caf97bbcb -- the warning is
expected sometimes when using CMA. However, that commit still spams
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0031-ASoC-Add-prompt-for-ICS43432-codec.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0031-ASoC-Add-prompt-for-ICS43432-codec.patch
index e6d2f9ff..14bf1127 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0031-ASoC-Add-prompt-for-ICS43432-codec.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0031-ASoC-Add-prompt-for-ICS43432-codec.patch
@@ -1,7 +1,7 @@
-From dab2bdc8c3a91f9b27cc0d6c1c890c908d37aa74 Mon Sep 17 00:00:00 2001
+From e32381933d576e651f729bdf3f2ec718b43f1314 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 23 Mar 2017 10:06:56 +0000
-Subject: [PATCH 031/495] ASoC: Add prompt for ICS43432 codec
+Subject: [PATCH 031/498] ASoC: Add prompt for ICS43432 codec
Without a prompt string, a config setting can't be included in a
defconfig. Give CONFIG_SND_SOC_ICS43432 a prompt so that Pi soundcards
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
index 80b5a791..715f6211 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0032-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
@@ -1,7 +1,7 @@
-From 4d7cfb2ba3caf207b0c4a99bcb6ae2e012461da7 Mon Sep 17 00:00:00 2001
+From 3f2bc7c5c2929de660f62bea3d76b81ad0379ebd Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 23 Jan 2018 16:52:45 +0000
-Subject: [PATCH 032/495] irqchip: irq-bcm2836: Remove regmap and syscon use
+Subject: [PATCH 032/498] irqchip: irq-bcm2836: Remove regmap and syscon use
The syscon node defines a register range that duplicates that used by
the local_intc node on bcm2836/7. Since irq-bcm2835 and irq-bcm2836 are
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch
index 267b1be0..d2dd9f48 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch
@@ -1,7 +1,7 @@
-From ba39c171e896dd5518e407c0a47412de1a77b4c4 Mon Sep 17 00:00:00 2001
+From acd4a3b295d133f92ee6c0088d92d9914181a4d1 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 17 Oct 2017 15:04:29 +0100
-Subject: [PATCH 033/495] lan78xx: Enable LEDs and auto-negotiation
+Subject: [PATCH 033/498] lan78xx: Enable LEDs and auto-negotiation
For applications of the LAN78xx that don't have valid programmed
EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
index e0793cfd..30112835 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0034-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
@@ -1,7 +1,7 @@
-From 980263d2fd394fad9e6a2f5a85934c3795e46782 Mon Sep 17 00:00:00 2001
+From c12a5d1e54bb635bdf19466c765dce1689bac78b Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 23 Feb 2016 17:26:48 +0000
-Subject: [PATCH 034/495] amba_pl011: Don't use DT aliases for numbering
+Subject: [PATCH 034/498] amba_pl011: Don't use DT aliases for numbering
The pl011 driver looks for DT aliases of the form "serial<n>",
and if found uses <n> as the device ID. This can cause
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0035-amba_pl011-Round-input-clock-up.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0035-amba_pl011-Round-input-clock-up.patch
index fca0751d..64096c6d 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0035-amba_pl011-Round-input-clock-up.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0035-amba_pl011-Round-input-clock-up.patch
@@ -1,7 +1,7 @@
-From 44121b34c35a825fc13a714d4b1b1f5289d53481 Mon Sep 17 00:00:00 2001
+From c2e38fc4b723d97ca418f853cdb2cb8bde4d03e6 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 1 Mar 2017 16:07:39 +0000
-Subject: [PATCH 035/495] amba_pl011: Round input clock up
+Subject: [PATCH 035/498] amba_pl011: Round input clock up
The UART clock is initialised to be as close to the requested
frequency as possible without exceeding it. Now that there is a
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
index 02c5c397..c737ae66 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0036-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
@@ -1,7 +1,7 @@
-From 08798edf30858c44c5e700ba6c6b56edce122786 Mon Sep 17 00:00:00 2001
+From bd9f2318cda55b89df91e175de0fad264e2ad335 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 29 Sep 2017 10:32:19 +0100
-Subject: [PATCH 036/495] amba_pl011: Insert mb() for correct FIFO handling
+Subject: [PATCH 036/498] amba_pl011: Insert mb() for correct FIFO handling
The pl011 register accessor functions use the _relaxed versions of the
standard readl() and writel() functions, meaning that there are no
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0037-amba_pl011-Add-cts-event-workaround-DT-property.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0037-amba_pl011-Add-cts-event-workaround-DT-property.patch
index e4011458..5c05de80 100644
--- a/'>sys-kernel/boest-v4.19.42/raspberrypi/0037-amba_pl011-Add-cts-event-workaround-DT-property.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0037-amba_pl011-Add-cts-event-workaround-DT-property.patch
@@ -1,7 +1,7 @@
-From 6ce4b24e30cbf18fe058817e3257bce26e478c37 Mon Sep 17 00:00:00 2001
+From df818afc5921c3a6e42dbd25edad9c3a72823341 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 29 Sep 2017 10:32:19 +0100
-Subject: [PATCH 037/495] amba_pl011: Add cts-event-workaround DT property
+Subject: [PATCH 037/498] amba_pl011: Add cts-event-workaround DT property
The BCM2835 PL011 implementation seems to have a bug that can lead to a
transmission lockup if CTS changes frequently. A workaround was added to
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
index 183f1a1e..701ce8bf 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
@@ -1,7 +1,7 @@
-From 151fc4b5ec2ffe2cdfa4bd7ed3a776d2ab377f4a Mon Sep 17 00:00:00 2001
+From 37c2cd80ae87405902a932e878598c478463f621 Mon Sep 17 00:00:00 2001
From: notro <notro@tronnes.org>
Date: Thu, 10 Jul 2014 13:59:47 +0200
-Subject: [PATCH 038/495] pinctrl-bcm2835: Set base to 0 give expected gpio
+Subject: [PATCH 038/498] pinctrl-bcm2835: Set base to 0 give expected gpio
numbering
Signed-off-by: Noralf Tronnes <notro@tronnes.org>
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0039-Main-bcm2708-bcm2709-linux-port.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0039-Main-bcm2708-bcm2709-linux-port.patch
index 6580a071..7ab82c15 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0039-Main-bcm2708-bcm2709-linux-port.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0039-Main-bcm2708-bcm2709-linux-port.patch
@@ -1,7 +1,7 @@
-From 05fa001a44434bc0cc7497190f34ea04615b2d35 Mon Sep 17 00:00:00 2001
+From a96b6624bea9f049d55af4519d3dfb7bcb690567 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 12 May 2013 12:24:19 +0100
-Subject: [PATCH 039/495] Main bcm2708/bcm2709 linux port
+Subject: [PATCH 039/498] Main bcm2708/bcm2709 linux port
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0040-Add-dwc_otg-driver.patch b/ b/sys-kernel/boest-v4.19.42/raspberrypi/0040-Add-dwc_otg-driver.patch
index 21b62556..d89bd8f1 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0040-Add-dwc_otg-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0040-Add-dwc_otg-driver.patch
@@ -1,7 +1,7 @@
-From 675ca42dd2ac3716e74cbec4579b2b46a581727c Mon Sep 17 00:00:00 2001
+From 7629ae6643b399ff5450a0577dc8ad05531f5766 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 May 2013 19:46:17 +0100
-Subject: [PATCH 040/495] Add dwc_otg driver
+Subject: [PATCH 040/498] Add dwc_otg driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -43325,7 +43325,7 @@ index 000000000000..fb57db09378f
+#endif /* DWC_DEVICE_ONLY */
diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
new file mode 100644
-index 000000000000..082159b64b34
+index 000000000000..c9fb1e4b67e4
--- /dev/null
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
@@ -0,0 +1,2752 @@
@@ -45966,7 +45966,7 @@ index 000000000000..082159b64b34
+ break;
+
+ default:
-+ DWC_WARN("Unexpected state received on hc=%d fsm=%d on transfer to device %d ep 0x%x",
++ DWC_WARN("Unexpected state received on hc=%d fsm=%d on transfer to device %d ep 0x%x",
+ hc->hc_num, st->fsm, hc->dev_addr, hc->ep_num);
+ qtd->error_count++;
+ release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0041-bcm2708-framebuffer-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0041-bcm2708-framebuffer-driver.patch
index de83ece6..a5f28138 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0041-bcm2708-framebuffer-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0041-bcm2708-framebuffer-driver.patch
@@ -1,7 +1,7 @@
-From 615a44c40e0c4c3f4716c0ccbaa1f607b549ab91 Mon Sep 17 00:00:00 2001
+From c45d1f931e6434b72d27f517f74017d4664481ca Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 17 Jun 2015 17:06:34 +0100
-Subject: [PATCH 041/495] bcm2708 framebuffer driver
+Subject: [PATCH 041/498] bcm2708 framebuffer driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0042-Speed-up-console-framebuffer-imageblit-function.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0042-Speed-up-console-framebuffer-imageblit-function.patch
index b8ea37ae..43dcace2 100644
--- a/'>sys-kernel/boest-v4.19.42/raspberrypi/0042-Speed-up-console-framebuffer-imageblit-function.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0042-Speed-up-console-framebuffer-imageblit-function.patch
@@ -1,7 +1,7 @@
-From 2513cfa8ffefebaaef213a624cb9fab15e085613 Mon Sep 17 00:00:00 2001
+From 0bed09cbf4d65c3acb1c7a44066d1e14d6098576 Mon Sep 17 00:00:00 2001
From: Harm Hanemaaijer <fgenfb@yahoo.com>
Date: Thu, 20 Jun 2013 20:21:39 +0200
-Subject: [PATCH 042/495] Speed up console framebuffer imageblit function
+Subject: [PATCH 042/498] Speed up console framebuffer imageblit function
Especially on platforms with a slower CPU but a relatively high
framebuffer fill bandwidth, like current ARM devices, the existing
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0043-dmaengine-Add-support-for-BCM2708.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0043-dmaengine-Add-support-for-BCM2708.patch
index ac24ac94..3f9f1a93 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0043-dmaengine-Add-support-for-BCM2708.patch
+++ b/'>sys-kernel/boest-v4.19.42/raspberrypi/0043-dmaengine-Add-support-for-BCM2708.patch
@@ -1,7 +1,7 @@
-From 66a444fa023bddbc781c580233ea87f3a49b3c95 Mon Sep 17 00:00:00 2001
+From f801b71e1c0f7bf5ae927674c5c85fddbd153a14 Mon Sep 17 00:00:00 2001
From: Florian Meier <florian.meier@koalo.de>
Date: Fri, 22 Nov 2013 14:22:53 +0100
-Subject: [PATCH 043/495] dmaengine: Add support for BCM2708
+Subject: [PATCH 043/498] dmaengine: Add support for BCM2708
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0044-MMC-added-alternative-MMC-driver.patch b/ b/sys-kernel/boest-v4.19.42/raspberrypi/0044-MMC-added-alternative-MMC-driver.patch
index 8a9c3714..8a411572 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0044-MMC-added-alternative-MMC-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0044-MMC-added-alternative-MMC-driver.patch
@@ -1,7 +1,7 @@
-From 409280e12baa27a4178804ac9c46746f51582028 Mon Sep 17 00:00:00 2001
+From c53cbf3608657878fb0ca9d7fe696239410c0cbc Mon Sep 17 00:00:00 2001
From: gellert <gellert@raspberrypi.org>
Date: Fri, 15 Aug 2014 16:35:06 +0100
-Subject: [PATCH 044/495] MMC: added alternative MMC driver
+Subject: [PATCH 044/498] MMC: added alternative MMC driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
index 0733a163..bdb50ab9 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0045-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
@@ -1,7 +1,7 @@
-From 6966bcd18d73c0f8fdef8faa2abf5bb290abc795 Mon Sep 17 00:00:00 2001
+From bbd708a6a1af994aae33f156b67760896d42e6f1 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 25 Mar 2015 17:49:47 +0000
-Subject: [PATCH 045/495] Adding bcm2835-sdhost driver, and an overlay to
+Subject: [PATCH 045/498] Adding bcm2835-sdhost driver, and an overlay to
enable it
BCM2835 has two SD card interfaces. This driver uses the other one.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
index 8f2cf58e..5fe4df02 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0046-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
@@ -1,7 +1,7 @@
-From af179fa596f37f922f1e203b4a8584dda8903768 Mon Sep 17 00:00:00 2001
+From ac750777b78c27e357a90bf42df872807fec7aa9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 28 Oct 2016 15:36:43 +0100
-Subject: [PATCH 046/495] vc_mem: Add vc_mem driver for querying firmware
+Subject: [PATCH 046/498] vc_mem: Add vc_mem driver for querying firmware
memory addresses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch
index 68c0e702..94a3aa63 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0047-vcsm-VideoCore-shared-memory-service-for-BCM2835.patch
@@ -1,7 +1,7 @@
-From d680308cfe8cb5148d72ca477f204b5cd91e2ba3 Mon Sep 17 00:00:00 2001
+From 5d6432f8e6be4bf3287dcc0516389154524d70d4 Mon Sep 17 00:00:00 2001
From: Tim Gover <tgover@broadcom.com>
Date: Tue, 22 Jul 2014 15:41:04 +0100
-Subject: [PATCH 047/495] vcsm: VideoCore shared memory service for BCM2835
+Subject: [PATCH 047/498] vcsm: VideoCore shared memory service for BCM2835
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
index 2dee04cd..ef5aeda7 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0048-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
@@ -1,7 +1,7 @@
-From fdf85679e8fd6589cabd96d3228f56a668a4ee32 Mon Sep 17 00:00:00 2001
+From 0dd482c9643895852817355119114122dae855dd Mon Sep 17 00:00:00 2001
From: Luke Wren <luke@raspberrypi.org>
Date: Fri, 21 Aug 2015 23:14:48 +0100
-Subject: [PATCH 048/495] Add /dev/gpiomem device for rootless user GPIO access
+Subject: [PATCH 048/498] Add /dev/gpiomem device for rootless user GPIO access
Signed-off-by: Luke Wren <luke@raspberrypi.org>
@@ -11,16 +11,16 @@ Build on ARCH_BCM2835, and fail to probe if no IO resource.
See: https://github.com/raspberrypi/linux/issues/1154
---
- drivers/char/broadcom/Kconfig | 9 +
- drivers/char/broadcom/Makefile | 3 +
+ drivers/char/broadcom/Kconfig | 8 +
+ drivers/char/broadcom/Makefile | 2 +
drivers/char/broadcom/bcm2835-gpiomem.c | 258 ++++++++++++++++++++++++
- 3 files changed, 270 insertions(+)
+ 3 files changed, 268 insertions(+)
diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index 2b6132d12b13..235704f2d916 100644
+index 2b6132d12b13..428a19f26fcb 100644
--- a/drivers/char/broadcom/Kconfig
+++ b/drivers/char/broadcom/Kconfig
-@@ -26,3 +26,12 @@ config BCM_VC_SM
+@@ -26,3 +26,11 @@ config BCM_VC_SM
help
Support for the VC shared memory on the Broadcom reference
design. Uses the VCHIQ stack.
@@ -32,17 +32,15 @@ index 2b6132d12b13..235704f2d916 100644
+ Provides users with root-free access to the GPIO registers
+ on the 2835. Calling mmap(/dev/gpiomem) will map the GPIO
+ register page to the user's pointer.
-+
diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index 419af4180deb..187a0b02f189 100644
+index 419af4180deb..788cb1304c6c 100644
--- a/drivers/char/broadcom/Makefile
+++ b/drivers/char/broadcom/Makefile
-@@ -1,2 +1,5 @@
+@@ -1,2 +1,4 @@
obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o
obj-$(CONFIG_BCM_VC_SM) += vc_sm/
+
+obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
-+
diff --git a/drivers/char/broadcom/bcm2835-gpiomem.c b/drivers/char/broadcom/bcm2835-gpiomem.c
new file mode 100644
index 000000000000..f5e7f1ba8fb6
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0049-Add-SMI-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0049-Add-SMI-driver.patch
index 9b9282a2..91b1f5c2 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0049-Add-SMI-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0049-Add-SMI-driver.patch
@@ -1,27 +1,27 @@
-From 8ee9a81234e5e9eece0574fafd4787bbeb542adf Mon Sep 17 00:00:00 2001
+From a6c2624c7ba04720be012921f238b63da0dc1db1 Mon Sep 17 00:00:00 2001
From: Luke Wren <wren6991@gmail.com>
Date: Sat, 5 Sep 2015 01:14:45 +0100
-Subject: [PATCH 049/495] Add SMI driver
+Subject: [PATCH 049/498] Add SMI driver
Signed-off-by: Luke Wren <wren6991@gmail.com>
---
- .../bindings/misc/brcm,bcm2835-smi-dev.txt | 17 +
- .../bindings/misc/brcm,bcm2835-smi.txt | 48 +
- drivers/char/broadcom/Kconfig | 8 +
- drivers/char/broadcom/Makefile | 2 +-
+ .../bindings/misc/brcm,bcm2835-smi-dev.txt | 15 +
+ .../bindings/misc/brcm,bcm2835-smi.txt | 47 +
+ drivers/char/broadcom/Kconfig | 9 +
+ drivers/char/broadcom/Makefile | 1 +
drivers/char/broadcom/bcm2835_smi_dev.c | 402 +++++++
drivers/misc/Kconfig | 8 +
drivers/misc/Makefile | 1 +
drivers/misc/bcm2835_smi.c | 985 ++++++++++++++++++
include/linux/broadcom/bcm2835_smi.h | 391 +++++++
- 9 files changed, 1861 insertions(+), 1 deletion(-)
+ 9 files changed, 1859 insertions(+)
diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt
new file mode 100644
-index 000000000000..68cc8ebc3392
+index 000000000000..1347fdf5da93
--- /dev/null
+++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,15 @@
+* Broadcom BCM2835 SMI character device driver.
+
+SMI or secondary memory interface is a peripheral specific to certain Broadcom
@@ -37,14 +37,12 @@ index 000000000000..68cc8ebc3392
+
+Optional properties:
+- None.
-+
-+
diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt
new file mode 100644
-index 000000000000..b76dc694f1ac
+index 000000000000..b2345aa9b8b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,47 @@
+* Broadcom BCM2835 SMI driver.
+
+SMI or secondary memory interface is a peripheral specific to certain Broadcom
@@ -92,15 +90,15 @@ index 000000000000..b76dc694f1ac
+ generally active low signals */
+ brcm,pull = <2 2 2 2 2 2 0 0 0 0 0 0 0 0>;
+};
-+
diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index 235704f2d916..4ef0d7af2bc7 100644
+index 428a19f26fcb..4ef0d7af2bc7 100644
--- a/drivers/char/broadcom/Kconfig
+++ b/drivers/char/broadcom/Kconfig
-@@ -35,3 +35,11 @@ config BCM2835_DEVGPIOMEM
+@@ -34,3 +34,12 @@ config BCM2835_DEVGPIOMEM
+ Provides users with root-free access to the GPIO registers
on the 2835. Calling mmap(/dev/gpiomem) will map the GPIO
register page to the user's pointer.
-
++
+config BCM2835_SMI_DEV
+ tristate "Character device driver for BCM2835 Secondary Memory Interface"
+ depends on BCM2835_SMI
@@ -110,14 +108,13 @@ index 235704f2d916..4ef0d7af2bc7 100644
+ Broadcom's Secondary Memory interface. The low-level functionality is provided
+ by the SMI driver itself.
diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index 187a0b02f189..d0ad04f8e498 100644
+index 788cb1304c6c..d0ad04f8e498 100644
--- a/drivers/char/broadcom/Makefile
+++ b/drivers/char/broadcom/Makefile
-@@ -2,4 +2,4 @@ obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o
+@@ -2,3 +2,4 @@ obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o
obj-$(CONFIG_BCM_VC_SM) += vc_sm/
obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
--
+obj-$(CONFIG_BCM2835_SMI_DEV) += bcm2835_smi_dev.o
diff --git a/drivers/char/broadcom/bcm2835_smi_dev.c b/drivers/char/broadcom/bcm2835_smi_dev.c
new file mode 100644
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch
index e3c2ff4e..4a1ffbab 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0050-MISC-bcm2835-smi-use-clock-manager-and-fix-reload-is.patch
@@ -1,7 +1,7 @@
-From 0463078ed2f963016569579871fffb3f8b116690 Mon Sep 17 00:00:00 2001
+From eb5f4390220fc13018575b97aad3676d85f2d671 Mon Sep 17 00:00:00 2001
From: Martin Sperl <kernel@martin.sperl.org>
Date: Tue, 26 Apr 2016 14:59:21 +0000
-Subject: [PATCH 050/495] MISC: bcm2835: smi: use clock manager and fix reload
+Subject: [PATCH 050/498] MISC: bcm2835: smi: use clock manager and fix reload
issues
Use clock manager instead of self-made clockmanager.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0051-Add-SMI-NAND-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0051-Add-SMI-NAND-driver.patch
index 6fd6eb1c..e132b560 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0051-Add-SMI-NAND-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0051-Add-SMI-NAND-driver.patch
@@ -1,7 +1,7 @@
-From f28274a824537d5959478e7930738dd87fa15aa7 Mon Sep 17 00:00:00 2001
+From d57676b3578ef2f4fca0f87b229cf6e925a52007 Mon Sep 17 00:00:00 2001
From: Luke Wren <wren6991@gmail.com>
Date: Sat, 5 Sep 2015 01:16:10 +0100
-Subject: [PATCH 051/495] Add SMI NAND driver
+Subject: [PATCH 051/498] Add SMI NAND driver
Signed-off-by: Luke Wren <wren6991@gmail.com>
---
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0052-Add-cpufreq-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0052-Add-cpufreq-driver.patch
index 08a0091b..f828a04f 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0052-Add-cpufreq-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0052-Add-cpufreq-driver.patch
@@ -1,7 +1,7 @@
-From 4ace130e640225de2f4ccb4b0017925624604a23 Mon Sep 17 00:00:00 2001
+From c071adf974507dbe361c17ef87a215267cec7c2c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 3 Jul 2013 00:49:20 +0100
-Subject: [PATCH 052/495] Add cpufreq driver
+Subject: [PATCH 052/498] Add cpufreq driver
Signed-off-by: popcornmix <popcornmix@gmail.com>
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0053-Add-Chris-Boot-s-i2c-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0053-Add-Chris-Boot-s-i2c-driver.patch
index 95006490..04afe85a 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0053-Add-Chris-Boot-s-i2c-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0053-Add-Chris-Boot-s-i2c-driver.patch
@@ -1,7 +1,7 @@
-From 1b5b80267fe8c2e10d8514b11b5053c9d18c7006 Mon Sep 17 00:00:00 2001
+From ff94284eb475c05d23b7bb065e3559f0036e6c98 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 17 Jun 2015 15:44:08 +0100
-Subject: [PATCH 053/495] Add Chris Boot's i2c driver
+Subject: [PATCH 053/498] Add Chris Boot's i2c driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -148,7 +148,7 @@ index 18b26af82b1c..6d28972ae56a 100644
diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c
new file mode 100644
-index 000000000000..962f2e5c7455
+index 000000000000..837b0425fa82
--- /dev/null
+++ b/drivers/i2c/busses/i2c-bcm2708.c
@@ -0,0 +1,512 @@
@@ -588,7 +588,7 @@ index 000000000000..962f2e5c7455
+ clk_tout = 35/1000*baud; //35ms timeout as per SMBus specs.
+ if (clk_tout > 0xffff)
+ clk_tout = 0xffff;
-+
++
+ bi->cdiv = cdiv;
+ bi->clk_tout = clk_tout;
+
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0054-char-broadcom-Add-vcio-module.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0054-char-broadcom-Add-vcio-module.patch
index 510d6bc5..578a4e19 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0054-char-broadcom-Add-vcio-module.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0054-char-broadcom-Add-vcio-module.patch
@@ -1,7 +1,7 @@
-From 667d2e438c2382dab991b635df55554f38bc29e1 Mon Sep 17 00:00:00 2001
+From 4ec114c2ead0a4c47226370f9a5ec1b4fa4fbe85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 26 Jun 2015 14:27:06 +0200
-Subject: [PATCH 054/495] char: broadcom: Add vcio module
+Subject: [PATCH 054/498] char: broadcom: Add vcio module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0055-firmware-bcm2835-Support-ARCH_BCM270x.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0055-firmware-bcm2835-Support-ARCH_BCM270x.patch
index 47fc1d56..8d2f8a40 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0055-firmware-bcm2835-Support-ARCH_BCM270x.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0055-firmware-bcm2835-Support-ARCH_BCM270x.patch
@@ -1,7 +1,7 @@
-From 3df816f133707a5a7b5ac90bdc5c2107a74b55e5 Mon Sep 17 00:00:00 2001
+From 12c939382905c974827b0bfa0a0f85a9f7471436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 26 Jun 2015 14:25:01 +0200
-Subject: [PATCH 055/495] firmware: bcm2835: Support ARCH_BCM270x
+Subject: [PATCH 055/498] firmware: bcm2835: Support ARCH_BCM270x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch
index 83616e84..5f03b3fa 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0056-scripts-Add-mkknlimg-and-knlinfo-scripts-from-tools-.patch
@@ -1,7 +1,7 @@
-From 925935f3a82909708469875aae95f28a92f694ae Mon Sep 17 00:00:00 2001
+From a19f913cf52da78667d1547c8905a3f5479a99d7 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 11 May 2015 09:00:42 +0100
-Subject: [PATCH 056/495] scripts: Add mkknlimg and knlinfo scripts from tools
+Subject: [PATCH 056/498] scripts: Add mkknlimg and knlinfo scripts from tools
repo
The Raspberry Pi firmware looks for a trailer on the kernel image to
@@ -92,7 +92,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
diff --git a/scripts/knlinfo b/scripts/knlinfo
new file mode 100755
-index 000000000000..263ec937eaa7
+index 000000000000..903cd6a244a8
--- /dev/null
+++ b/scripts/knlinfo
@@ -0,0 +1,171 @@
@@ -223,7 +223,7 @@ index 000000000000..263ec937eaa7
+ push @$atoms, [ $atom_type, $atom_data ];
+ }
+
-+ if (($$atoms[-1][0] eq "\x00\x00\x00\x00") &&
++ if (($$atoms[-1][0] eq "\x00\x00\x00\x00") &&
+ ($$atoms[-1][1] eq ""))
+ {
+ pop @$atoms;
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0057-BCM2708-Add-core-Device-Tree-support.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0057-BCM2708-Add-core-Device-Tree-support.patch
index 6d462092..2e30b33e 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0057-BCM2708-Add-core-Device-Tree-support.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0057-BCM2708-Add-core-Device-Tree-support.patch
@@ -1,7 +1,7 @@
-From 6e37574857231f825afa0a9a61be27ed2f69ce4b Mon Sep 17 00:00:00 2001
+From 52ab7de829d37908197ad28dba7a352ba8f05dbf Mon Sep 17 00:00:00 2001
From: notro <notro@tronnes.org>
Date: Wed, 9 Jul 2014 14:46:08 +0200
-Subject: [PATCH 057/495] BCM2708: Add core Device Tree support
+Subject: [PATCH 057/498] BCM2708: Add core Device Tree support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -231,7 +231,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
.../overlays/akkordion-iqdacplus-overlay.dts | 49 +
.../allo-boss-dac-pcm512x-audio-overlay.dts | 59 +
.../dts/overlays/allo-digione-overlay.dts | 44 +
- .../allo-katana-dac-audio-overlay.dts | 57 +
+ .../allo-katana-dac-audio-overlay.dts | 56 +
.../allo-piano-dac-pcm512x-audio-overlay.dts | 54 +
...o-piano-dac-plus-pcm512x-audio-overlay.dts | 55 +
.../boot/dts/overlays/applepi-dac-overlay.dts | 57 +
@@ -280,14 +280,14 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
.../boot/dts/overlays/iqaudio-dac-overlay.dts | 46 +
.../dts/overlays/iqaudio-dacplus-overlay.dts | 49 +
.../iqaudio-digi-wm8804-audio-overlay.dts | 47 +
- .../dts/overlays/jedec-spi-nor-overlay.dts | 309 +++
+ .../dts/overlays/jedec-spi-nor-overlay.dts | 308 +++
.../dts/overlays/justboom-dac-overlay.dts | 46 +
.../dts/overlays/justboom-digi-overlay.dts | 41 +
.../boot/dts/overlays/lirc-rpi-overlay.dts | 57 +
.../arm/boot/dts/overlays/ltc294x-overlay.dts | 86 +
.../boot/dts/overlays/mbed-dac-overlay.dts | 64 +
- .../boot/dts/overlays/mcp23017-overlay.dts | 54 +
- .../boot/dts/overlays/mcp23s17-overlay.dts | 732 +++++++
+ .../boot/dts/overlays/mcp23017-overlay.dts | 53 +
+ .../boot/dts/overlays/mcp23s17-overlay.dts | 731 ++++++
.../dts/overlays/mcp2515-can0-overlay.dts | 73 +
.../dts/overlays/mcp2515-can1-overlay.dts | 73 +
.../arm/boot/dts/overlays/mcp3008-overlay.dts | 205 ++
@@ -305,7 +305,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
.../dts/overlays/pi3-miniuart-bt-overlay.dts | 74 +
arch/arm/boot/dts/overlays/pibell-overlay.dts | 81 +
.../boot/dts/overlays/piscreen-overlay.dts | 102 +
- .../boot/dts/overlays/piscreen2r-overlay.dts | 106 +
+ .../boot/dts/overlays/piscreen2r-overlay.dts | 105 +
.../arm/boot/dts/overlays/pisound-overlay.dts | 120 +
.../arm/boot/dts/overlays/pitft22-overlay.dts | 69 +
.../overlays/pitft28-capacitive-overlay.dts | 91 +
@@ -347,11 +347,11 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
.../boot/dts/overlays/spi2-2cs-overlay.dts | 69 +
.../boot/dts/overlays/spi2-3cs-overlay.dts | 81 +
.../dts/overlays/superaudioboard-overlay.dts | 73 +
- arch/arm/boot/dts/overlays/sx150x-overlay.dts | 1706 ++++++++++++++
+ arch/arm/boot/dts/overlays/sx150x-overlay.dts | 1705 ++++++++++++++
.../boot/dts/overlays/tinylcd35-overlay.dts | 224 ++
arch/arm/boot/dts/overlays/uart0-overlay.dts | 32 +
arch/arm/boot/dts/overlays/uart1-overlay.dts | 38 +
- .../upstream-aux-interrupt-overlay.dts | 33 +
+ .../upstream-aux-interrupt-overlay.dts | 32 +
.../boot/dts/overlays/upstream-overlay.dts | 154 ++
.../dts/overlays/vc4-fkms-v3d-overlay.dts | 89 +
.../boot/dts/overlays/vc4-kms-v3d-overlay.dts | 151 ++
@@ -361,7 +361,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
.../arm/boot/dts/overlays/wittypi-overlay.dts | 44 +
scripts/Makefile.dtbinst | 8 +-
scripts/Makefile.lib | 13 +
- 159 files changed, 14852 insertions(+), 4 deletions(-)
+ 159 files changed, 14845 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 97ba6b79834c..d99301c57cff 100644
@@ -4168,7 +4168,7 @@ index 000000000000..61bfe29cfb8f
+http://www.raspberrypi.org/documentation/configuration/device-tree.md
diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
new file mode 100644
-index 000000000000..1aaca71c1b67
+index 000000000000..f8c4f3a0f9fd
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
@@ -0,0 +1,40 @@
@@ -4178,22 +4178,22 @@ index 000000000000..1aaca71c1b67
+
+/ {
+ compatible = "brcm,bcm2708";
-+
++
+ fragment@0 {
-+ target = <&i2c>;
-+
++ target = <&i2c>;
++
+ __overlay__ {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
-+
++
+ adau1977: codec@11 {
-+ compatible = "adi,adau1977";
-+ reg = <0x11>;
-+ reset-gpios = <&gpio 5 0>;
++ compatible = "adi,adau1977";
++ reg = <0x11>;
++ reset-gpios = <&gpio 5 0>;
+ AVDD-supply = <&vdd_3v3_reg>;
-+ };
-+ };
++ };
++ };
+ };
+
+ fragment@1 {
@@ -4750,10 +4750,10 @@ index 000000000000..101277a11a24
+};
diff --git a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
new file mode 100644
-index 000000000000..6dc4acf1f80c
+index 000000000000..b464fbd2989e
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,56 @@
+/*
+ * Definitions for Allo Katana DAC boards
+ */
@@ -4810,7 +4810,6 @@ index 000000000000..6dc4acf1f80c
+ };
+ };
+};
-+
diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
new file mode 100644
index 000000000000..a5468d850a91
@@ -7892,10 +7891,10 @@ index 000000000000..b86e1e5edc89
+};
diff --git a/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
new file mode 100644
-index 000000000000..279e22efc013
+index 000000000000..3ff0041929c9
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
-@@ -0,0 +1,309 @@
+@@ -0,0 +1,308 @@
+// Overlay for JEDEC SPI-NOR Flash Devices (aka m25p80)
+
+// dtparams:
@@ -8204,7 +8203,6 @@ index 000000000000..279e22efc013
+ flash-fastr-spi2-2 = <0>,"+7+15+23";
+ };
+};
-+
diff --git a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
new file mode 100644
index 000000000000..2b8dba0c231b
@@ -8369,7 +8367,7 @@ index 000000000000..7d5d82bdf4c4
+};
diff --git a/arch/arm/boot/dts/overlays/ltc294x-overlay.dts b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts
new file mode 100644
-index 000000000000..6d971f3649ca
+index 000000000000..04903802867b
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts
@@ -0,0 +1,86 @@
@@ -8391,7 +8389,7 @@ index 000000000000..6d971f3649ca
+ compatible = "lltc,ltc2941";
+ reg = <0x64>;
+ lltc,resistor-sense = <50>;
-+ lltc,prescaler-exponent = <7>;
++ lltc,prescaler-exponent = <7>;
+ };
+ };
+ };
@@ -8407,7 +8405,7 @@ index 000000000000..6d971f3649ca
+ compatible = "lltc,ltc2942";
+ reg = <0x64>;
+ lltc,resistor-sense = <50>;
-+ lltc,prescaler-exponent = <7>;
++ lltc,prescaler-exponent = <7>;
+ };
+ };
+ };
@@ -8423,7 +8421,7 @@ index 000000000000..6d971f3649ca
+ compatible = "lltc,ltc2943";
+ reg = <0x64>;
+ lltc,resistor-sense = <50>;
-+ lltc,prescaler-exponent = <7>;
++ lltc,prescaler-exponent = <7>;
+ };
+ };
+ };
@@ -8439,7 +8437,7 @@ index 000000000000..6d971f3649ca
+ compatible = "lltc,ltc2944";
+ reg = <0x64>;
+ lltc,resistor-sense = <50>;
-+ lltc,prescaler-exponent = <7>;
++ lltc,prescaler-exponent = <7>;
+ };
+ };
+ };
@@ -8531,10 +8529,10 @@ index 000000000000..313563d6ed47
+};
diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
new file mode 100644
-index 000000000000..412f966a3cc0
+index 000000000000..55fa237cf583
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,53 @@
+// Definitions for MCP23017 Gpio Extender from Microchip Semiconductor
+
+/dts-v1/;
@@ -8581,20 +8579,19 @@ index 000000000000..412f966a3cc0
+ };
+ };
+ };
-+
++
+ __overrides__ {
+ gpiopin = <&mcp23017_pins>,"brcm,pins:0",
+ <&mcp23017>,"interrupts:0";
+ addr = <&mcp23017>,"reg:0";
+ };
+};
-+
diff --git a/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
new file mode 100644
-index 000000000000..7dcbacb3cd00
+index 000000000000..4e719f45663c
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
-@@ -0,0 +1,732 @@
+@@ -0,0 +1,731 @@
+// Overlay for MCP23S08/17 GPIO Extenders from Microchip Semiconductor
+
+// dtparams:
@@ -8692,11 +8689,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_00: mcp23s08@0 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi0-0-present parameter */
-+ reg = <0>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi0-0-present parameter */
++ reg = <0>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi0-0-int-gpio parameter */
@@ -8713,11 +8710,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_01: mcp23s08@1 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi0-1-present parameter */
-+ reg = <1>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi0-1-present parameter */
++ reg = <1>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi0-1-int-gpio parameter */
@@ -8734,11 +8731,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_10: mcp23s08@0 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi1-0-present parameter */
-+ reg = <0>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi1-0-present parameter */
++ reg = <0>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi1-0-int-gpio parameter */
@@ -8755,11 +8752,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_11: mcp23s08@1 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi1-1-present parameter */
-+ reg = <1>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi1-1-present parameter */
++ reg = <1>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi1-1-int-gpio parameter */
@@ -8776,11 +8773,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_12: mcp23s08@2 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi1-2-present parameter */
-+ reg = <2>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi1-2-present parameter */
++ reg = <2>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi1-2-int-gpio parameter */
@@ -8797,11 +8794,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_20: mcp23s08@0 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi2-0-present parameter */
-+ reg = <0>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi2-0-present parameter */
++ reg = <0>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi2-0-int-gpio parameter */
@@ -8818,11 +8815,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_21: mcp23s08@1 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi2-1-present parameter */
-+ reg = <1>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi2-1-present parameter */
++ reg = <1>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi2-1-int-gpio parameter */
@@ -8839,11 +8836,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s08_22: mcp23s08@2 {
+ compatible = "microchip,mcp23s08";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi2-2-present parameter */
-+ reg = <2>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s08-spi2-2-present parameter */
++ reg = <2>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi2-2-int-gpio parameter */
@@ -8860,11 +8857,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_00: mcp23s17@0 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi0-0-present parameter */
-+ reg = <0>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi0-0-present parameter */
++ reg = <0>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi0-0-int-gpio parameter */
@@ -8881,11 +8878,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_01: mcp23s17@1 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi0-1-present parameter */
-+ reg = <1>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi0-1-present parameter */
++ reg = <1>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi0-1-int-gpio parameter */
@@ -8902,11 +8899,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_10: mcp23s17@0 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi1-0-present parameter */
-+ reg = <0>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi1-0-present parameter */
++ reg = <0>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi1-0-int-gpio parameter */
@@ -8923,11 +8920,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_11: mcp23s17@1 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi1-1-present parameter */
-+ reg = <1>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi1-1-present parameter */
++ reg = <1>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi1-1-int-gpio parameter */
@@ -8944,11 +8941,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_12: mcp23s17@2 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi1-2-present parameter */
-+ reg = <2>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi1-2-present parameter */
++ reg = <2>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi1-2-int-gpio parameter */
@@ -8965,11 +8962,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_20: mcp23s17@0 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi2-0-present parameter */
-+ reg = <0>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi2-0-present parameter */
++ reg = <0>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi2-0-int-gpio parameter */
@@ -8986,11 +8983,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_21: mcp23s17@1 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi2-1-present parameter */
-+ reg = <1>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi2-1-present parameter */
++ reg = <1>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi2-1-int-gpio parameter */
@@ -9007,11 +9004,11 @@ index 000000000000..7dcbacb3cd00
+ #size-cells = <0>;
+ mcp23s17_22: mcp23s17@2 {
+ compatible = "microchip,mcp23s17";
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi2-2-present parameter */
-+ reg = <2>;
-+ spi-max-frequency = <500000>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ microchip,spi-present-mask = <0x00>; /* overwritten by mcp23s17-spi2-2-present parameter */
++ reg = <2>;
++ spi-max-frequency = <500000>;
+ status = "okay";
+ #interrupt-cells=<2>;
+ interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi2-2-int-gpio parameter */
@@ -9326,7 +9323,6 @@ index 000000000000..7dcbacb3cd00
+ s17-spi2-2-int-gpio = <0>,"+31+47", <&spi2_2_int_pins>,"brcm,pins:0", <&mcp23s17_22>,"interrupts:0";
+ };
+};
-+
diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
new file mode 100755
index 000000000000..03eb5486fa9c
@@ -9909,7 +9905,7 @@ index 000000000000..9902c4614ea1
+};
diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts
new file mode 100644
-index 000000000000..ce4db35228e9
+index 000000000000..112769f80c3a
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts
@@ -0,0 +1,134 @@
@@ -10031,7 +10027,7 @@ index 000000000000..ce4db35228e9
+ speed = <&rpidisplay>,"spi-max-frequency:0";
+ rotate = <&rpidisplay>,"rotate:0";
+ fps = <&rpidisplay>,"fps:0";
-+ debug = <&rpidisplay>,"debug:0",
++ debug = <&rpidisplay>,"debug:0",
+ <&lirc_rpi>,"rpi,debug:0";
+ xohms = <&rpidisplay_ts>,"ti,x-plate-ohms;0";
+ swapxy = <&rpidisplay_ts>,"ti,swap-xy?";
@@ -10816,10 +10812,10 @@ index 000000000000..40a1f295346e
+};
diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
new file mode 100644
-index 000000000000..9c0bed893057
+index 000000000000..d38a31a64a6e
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,105 @@
+ /*
+ * Device Tree overlay for PiScreen2 3.5" TFT with resistive touch by Ozzmaker.com
+ *
@@ -10925,7 +10921,6 @@ index 000000000000..9c0bed893057
+ xohms = <&piscreen2_ts>,"ti,x-plate-ohms;0";
+ };
+};
-+
diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts
new file mode 100644
index 000000000000..0893717af4e0
@@ -11730,7 +11725,7 @@ index 000000000000..b4e601396c49
+};
diff --git a/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
new file mode 100644
-index 000000000000..819f400a9054
+index 000000000000..a7a54aeedaf8
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
@@ -0,0 +1,59 @@
@@ -11769,7 +11764,7 @@ index 000000000000..819f400a9054
+ };
+ };
+
-+ };
++ };
+
+ __overrides__ {
+ pin_a = <&rotary>,"gpios:4",
@@ -13434,7 +13429,7 @@ index 000000000000..a62e107dc98f
+};
diff --git a/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
new file mode 100755
-index 000000000000..e625faeed7fb
+index 000000000000..9514e84b7ad5
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
@@ -0,0 +1,73 @@
@@ -13490,7 +13485,7 @@ index 000000000000..e625faeed7fb
+ status = "okay";
+ };
+ };
-+
++
+ fragment@2 {
+ target = <&i2c1>;
+ __overlay__ {
@@ -13513,10 +13508,10 @@ index 000000000000..e625faeed7fb
+};
diff --git a/arch/arm/boot/dts/overlays/sx150x-overlay.dts b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
new file mode 100644
-index 000000000000..0321b292c133
+index 000000000000..157d347b29f4
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
-@@ -0,0 +1,1706 @@
+@@ -0,0 +1,1705 @@
+// Definitions for SX150x I2C GPIO Expanders from Semtech
+
+// dtparams:
@@ -15222,7 +15217,6 @@ index 000000000000..0321b292c133
+ sx1509-1-71-int-gpio = <0>,"+89+105", <&sx150x_1_71_pins>,"brcm,pins:0", <&sx1509_1_71>,"interrupts:0";
+ };
+};
-+
diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
new file mode 100644
index 000000000000..ed2b053aef23
@@ -15537,10 +15531,10 @@ index 000000000000..fa73e1feaeb1
+};
diff --git a/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts b/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
new file mode 100644
-index 000000000000..04e271b72a3a
+index 000000000000..8cdf30687af7
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,32 @@
+// Overlay for missing AUX interrupt controller
+// Instead we bind all AUX devices to the generic AUX interrupt line
+/dts-v1/;
@@ -15573,7 +15567,6 @@ index 000000000000..04e271b72a3a
+ };
+ };
+};
-+
diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
new file mode 100644
index 000000000000..ff37a5013de4
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch
index e7e12145..a024b3ea 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0058-BCM270x_DT-Add-pwr_led-and-the-required-input-trigge.patch
@@ -1,7 +1,7 @@
-From 6f0c19650325e8d92bef9e746f37fa7c5b7e64f6 Mon Sep 17 00:00:00 2001
+From 69ce7ef97bc2542423714efc58ceaaf330c3ddd9 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 6 Feb 2015 13:50:57 +0000
-Subject: [PATCH 058/495] BCM270x_DT: Add pwr_led, and the required "input"
+Subject: [PATCH 058/498] BCM270x_DT: Add pwr_led, and the required "input"
trigger
The "input" trigger makes the associated GPIO an input. This is to support
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0059-fbdev-add-FBIOCOPYAREA-ioctl.patch b/ b/sys-kernel/boest-v4.19.42/raspberrypi/0059-fbdev-add-FBIOCOPYAREA-ioctl.patch
index 5bc276a0..95f4b39a 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0059-fbdev-add-FBIOCOPYAREA-ioctl.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0059-fbdev-add-FBIOCOPYAREA-ioctl.patch
@@ -1,7 +1,7 @@
-From 9d670c69ee1a5dc0663c4de40d553828deeec4ab Mon Sep 17 00:00:00 2001
+From 2b183139f7c86d44ebbd0c085144f766139eb64f Mon Sep 17 00:00:00 2001
From: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Date: Mon, 17 Jun 2013 13:32:11 +0300
-Subject: [PATCH 059/495] fbdev: add FBIOCOPYAREA ioctl
+Subject: [PATCH 059/498] fbdev: add FBIOCOPYAREA ioctl
Based on the patch authored by Ali Gholami Rudi at
https://lkml.org/lkml/2009/7/13/153
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0060-Added-Device-IDs-for-August-DVB-T-205.patch b/ b/sys-kernel/boest-v4.19.42/raspberrypi/0060-Added-Device-IDs-for-August-DVB-T-205.patch
index 0d6c05db..0cd83bfe 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0060-Added-Device-IDs-for-August-DVB-T-205.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0060-Added-Device-IDs-for-August-DVB-T-205.patch
@@ -1,7 +1,7 @@
-From cf7375d33565dbeebdd4f91f1621fba5541996f9 Mon Sep 17 00:00:00 2001
+From dd2a84fa66d2d1e1e9349049c1ee6a59d12fb28c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 3 Jul 2013 00:54:08 +0100
-Subject: [PATCH 060/495] Added Device IDs for August DVB-T 205
+Subject: [PATCH 060/498] Added Device IDs for August DVB-T 205
---
drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch
index adb4362b..0bf657cf 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0061-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch
@@ -1,7 +1,7 @@
-From bf92b663d7f7e10d71b7f945e501160bbeb5747e Mon Sep 17 00:00:00 2001
+From 06137a7ceb397825b1521ae9d333a16fe79c4eff Mon Sep 17 00:00:00 2001
From: Gordon Hollingworth <gordon@raspberrypi.org>
Date: Tue, 12 May 2015 14:47:56 +0100
-Subject: [PATCH 061/495] rpi-ft5406: Add touchscreen driver for pi LCD display
+Subject: [PATCH 061/498] rpi-ft5406: Add touchscreen driver for pi LCD display
Fix driver detection failure Check that the buffer response is non-zero meaning the touchscreen was detected
@@ -48,7 +48,7 @@ index 5911a4190cd2..cbc2159c16a5 100644
obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o
diff --git a/drivers/input/touchscreen/rpi-ft5406.c b/drivers/input/touchscreen/rpi-ft5406.c
new file mode 100644
-index 000000000000..9d7d05482355
+index 000000000000..cc8035b73313
--- /dev/null
+++ b/drivers/input/touchscreen/rpi-ft5406.c
@@ -0,0 +1,292 @@
@@ -106,10 +106,10 @@ index 000000000000..9d7d05482355
+};
+
+/* Thread to poll for touchscreen events
-+ *
++ *
+ * This thread polls the memory based register copy of the ft5406 registers
+ * using the number of points register to know whether the copy has been
-+ * updated (we write 99 to the memory copy, the GPU will write between
++ * updated (we write 99 to the memory copy, the GPU will write between
+ * 0 - 10 points)
+ */
+static int ft5406_thread(void *arg)
@@ -117,7 +117,7 @@ index 000000000000..9d7d05482355
+ struct ft5406 *ts = (struct ft5406 *) arg;
+ struct ft5406_regs regs;
+ int known_ids = 0;
-+
++
+ while(!kthread_should_stop())
+ {
+ // 60fps polling
@@ -135,12 +135,12 @@ index 000000000000..9d7d05482355
+ int x = (((int) regs.point[i].xh & 0xf) << 8) + regs.point[i].xl;
+ int y = (((int) regs.point[i].yh & 0xf) << 8) + regs.point[i].yl;
+ int touchid = (regs.point[i].yh >> 4) & 0xf;
-+
++
+ modified_ids |= 1 << touchid;
+
+ if(!((1 << touchid) & known_ids))
+ dev_dbg(&ts->pdev->dev, "x = %d, y = %d, touchid = %d\n", x, y, touchid);
-+
++
+ input_mt_slot(ts->input_dev, touchid);
+ input_mt_report_slot_state(ts->input_dev, MT_TOOL_FINGER, 1);
+
@@ -161,13 +161,13 @@ index 000000000000..9d7d05482355
+ }
+ }
+ known_ids = modified_ids;
-+
++
+ input_mt_report_pointer_emulation(ts->input_dev, true);
+ input_sync(ts->input_dev);
+ }
-+
++
+ }
-+
++
+ return 0;
+}
+
@@ -180,9 +180,9 @@ index 000000000000..9d7d05482355
+ struct device_node *fw_node;
+ struct rpi_firmware *fw;
+ u32 touchbuf;
-+
++
+ dev_info(dev, "Probing device\n");
-+
++
+ fw_node = of_parse_phandle(np, "firmware", 0);
+ if (!fw_node) {
+ dev_err(dev, "Missing firmware node\n");
@@ -254,9 +254,9 @@ index 000000000000..9d7d05482355
+ }
+ platform_set_drvdata(pdev, ts);
+ ts->pdev = pdev;
-+
++
+ ts->input_dev->name = "FT5406 memory based driver";
-+
++
+ __set_bit(EV_KEY, ts->input_dev->evbit);
+ __set_bit(EV_SYN, ts->input_dev->evbit);
+ __set_bit(EV_ABS, ts->input_dev->evbit);
@@ -269,7 +269,7 @@ index 000000000000..9d7d05482355
+ input_mt_init_slots(ts->input_dev, MAXIMUM_SUPPORTED_POINTS, INPUT_MT_DIRECT);
+
+ input_set_drvdata(ts->input_dev, ts);
-+
++
+ err = input_register_device(ts->input_dev);
+ if (err) {
+ dev_err(dev, "could not register input device, %d\n",
@@ -308,9 +308,9 @@ index 000000000000..9d7d05482355
+{
+ struct device *dev = &pdev->dev;
+ struct ft5406 *ts = (struct ft5406 *) platform_get_drvdata(pdev);
-+
++
+ dev_info(dev, "Removing rpi-ft5406\n");
-+
++
+ kthread_stop(ts->thread);
+
+ if (ts->bus_addr)
@@ -319,7 +319,7 @@ index 000000000000..9d7d05482355
+ iounmap(ts->ts_base);
+ if (ts->input_dev)
+ input_unregister_device(ts->input_dev);
-+
++
+ return 0;
+}
+
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch
index c7a45d2e..9f2e3631 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0062-Improve-__copy_to_user-and-__copy_from_user-performa.patch
@@ -1,7 +1,7 @@
-From b526e6ba5989037eaf6550b8f9b2612ae5dcbfe9 Mon Sep 17 00:00:00 2001
+From e5534e9ed3bc2d5f6bd935e8442e7652534bdc5f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 28 Nov 2016 16:50:04 +0000
-Subject: [PATCH 062/495] Improve __copy_to_user and __copy_from_user
+Subject: [PATCH 062/498] Improve __copy_to_user and __copy_from_user
performance
Provide a __copy_from_user that uses memcpy. On BCM2708, use
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
index f0a41fc6..cfde340a 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0063-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
@@ -1,7 +1,7 @@
-From 17ecf69ab0a9cb9e151f891b632aed24655bb28e Mon Sep 17 00:00:00 2001
+From be5277dd4fb1140285dea026257a4cc9824fd47d Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 25 Jun 2015 12:16:11 +0100
-Subject: [PATCH 063/495] gpio-poweroff: Allow it to work on Raspberry Pi
+Subject: [PATCH 063/498] gpio-poweroff: Allow it to work on Raspberry Pi
The Raspberry Pi firmware manages the power-down and reboot
process. To do this it installs a pm_power_off handler, causing
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
index 6d53e236..cad4e9d8 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
@@ -1,7 +1,7 @@
-From 75da7856d60e74458227e0dade186007b0491090 Mon Sep 17 00:00:00 2001
+From 98a5f0b112e41f8c45fa1a4ea99101ac0d719b94 Mon Sep 17 00:00:00 2001
From: Phil Elwell <pelwell@users.noreply.github.com>
Date: Tue, 14 Jul 2015 14:32:47 +0100
-Subject: [PATCH 064/495] mfd: Add Raspberry Pi Sense HAT core driver
+Subject: [PATCH 064/498] mfd: Add Raspberry Pi Sense HAT core driver
---
drivers/input/joystick/Kconfig | 8 +
@@ -9,14 +9,14 @@ Subject: [PATCH 064/495] mfd: Add Raspberry Pi Sense HAT core driver
drivers/input/joystick/rpisense-js.c | 153 ++++++++++++
drivers/mfd/Kconfig | 8 +
drivers/mfd/Makefile | 2 +-
- drivers/mfd/rpisense-core.c | 157 ++++++++++++
+ drivers/mfd/rpisense-core.c | 156 ++++++++++++
drivers/video/fbdev/Kconfig | 13 +
drivers/video/fbdev/Makefile | 1 +
- drivers/video/fbdev/rpisense-fb.c | 293 +++++++++++++++++++++++
+ drivers/video/fbdev/rpisense-fb.c | 292 +++++++++++++++++++++++
include/linux/mfd/rpisense/core.h | 47 ++++
include/linux/mfd/rpisense/framebuffer.h | 32 +++
include/linux/mfd/rpisense/joystick.h | 35 +++
- 12 files changed, 749 insertions(+), 1 deletion(-)
+ 12 files changed, 747 insertions(+), 1 deletion(-)
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index d8f9c6e1fc08..212d8a69467d 100644
@@ -235,10 +235,10 @@ index 5856a9489cbd..aa72f59f94c8 100644
+obj-$(CONFIG_MFD_RPISENSE_CORE) += rpisense-core.o
diff --git a/drivers/mfd/rpisense-core.c b/drivers/mfd/rpisense-core.c
new file mode 100644
-index 000000000000..eea9312dc96a
+index 000000000000..715792b093c3
--- /dev/null
+++ b/drivers/mfd/rpisense-core.c
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,156 @@
+/*
+ * Raspberry Pi Sense HAT core driver
+ * http://raspberrypi.org
@@ -395,7 +395,6 @@ index 000000000000..eea9312dc96a
+MODULE_DESCRIPTION("Raspberry Pi Sense HAT core driver");
+MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
+MODULE_LICENSE("GPL");
-+
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 3c7683bc7209..633a3344e339 100644
--- a/drivers/video/fbdev/Kconfig
@@ -431,10 +430,10 @@ index 784c57ffd660..aac19b4ffb7b 100644
obj-$(CONFIG_FB_VIRTUAL) += vfb.o
diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c
new file mode 100644
-index 000000000000..26432a5a0b4b
+index 000000000000..b775edcae028
--- /dev/null
+++ b/drivers/video/fbdev/rpisense-fb.c
-@@ -0,0 +1,293 @@
+@@ -0,0 +1,292 @@
+/*
+ * Raspberry Pi Sense HAT framebuffer driver
+ * http://raspberrypi.org
@@ -727,7 +726,6 @@ index 000000000000..26432a5a0b4b
+MODULE_DESCRIPTION("Raspberry Pi Sense HAT framebuffer driver");
+MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
+MODULE_LICENSE("GPL");
-+
diff --git a/include/linux/mfd/rpisense/core.h b/include/linux/mfd/rpisense/core.h
new file mode 100644
index 000000000000..4856aa3c8b06
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch
index b14f9094..0de71831 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0065-ASoC-pcm512x-implement-set_tdm_slot-interface.patch
@@ -1,7 +1,7 @@
-From b240fe7beffa06037ff9a1ee96b2dcb0c895a639 Mon Sep 17 00:00:00 2001
+From 6a6dbaf9fcd9ffae5a1d350b99091234ecfac13f Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Thu, 22 Feb 2018 11:55:06 +0100
-Subject: [PATCH 065/495] ASoC: pcm512x: implement set_tdm_slot interface
+Subject: [PATCH 065/498] ASoC: pcm512x: implement set_tdm_slot interface
PCM512x can accept data padded with additional BCLK cycles
but the driver currently lacks an interface to configure this.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0066-ASoC-Add-support-for-Rpi-DAC.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0066-ASoC-Add-support-for-Rpi-DAC.patch
index 24372e9d..825a0bc8 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0066-ASoC-Add-support-for-Rpi-DAC.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0066-ASoC-Add-support-for-Rpi-DAC.patch
@@ -1,7 +1,7 @@
-From 7456bcae9d302af956859491eebb096998372c0c Mon Sep 17 00:00:00 2001
+From b62dddcc7d987539403caa8d624afc6417488a13 Mon Sep 17 00:00:00 2001
From: Florian Meier <florian.meier@koalo.de>
Date: Mon, 25 Jan 2016 15:48:59 +0000
-Subject: [PATCH 066/495] ASoC: Add support for Rpi-DAC
+Subject: [PATCH 066/498] ASoC: Add support for Rpi-DAC
---
sound/soc/codecs/Kconfig | 5 +++
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch
index 93ce4cfa..d5a71174 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0067-Add-IQaudIO-Sound-Card-support-for-Raspberry-Pi.patch
@@ -1,7 +1,7 @@
-From c3db1b6574496a9397924ee0f90051c9fd3f89c2 Mon Sep 17 00:00:00 2001
+From bb3d94950c03b186a46abf78cb8a6e403fbf737f Mon Sep 17 00:00:00 2001
From: Gordon Garrity <gordon@iqaudio.com>
Date: Sat, 8 Mar 2014 16:56:57 +0000
-Subject: [PATCH 067/495] Add IQaudIO Sound Card support for Raspberry Pi
+Subject: [PATCH 067/498] Add IQaudIO Sound Card support for Raspberry Pi
Set a limit of 0dB on Digital Volume Control
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0068-Added-support-for-HiFiBerry-DAC.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0068-Added-support-for-HiFiBerry-DAC.patch
index 6884d884..d382e9f9 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0068-Added-support-for-HiFiBerry-DAC.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0068-Added-support-for-HiFiBerry-DAC.patch
@@ -1,7 +1,7 @@
-From f0dc63cb6a720a7dc8c88d184f02298c8da66aee Mon Sep 17 00:00:00 2001
+From 8c590df54113d3795bad1094c05ece93c3862b7d Mon Sep 17 00:00:00 2001
From: Daniel Matuschek <info@crazy-audio.com>
Date: Mon, 4 Aug 2014 10:06:56 +0200
-Subject: [PATCH 068/495] Added support for HiFiBerry DAC+
+Subject: [PATCH 068/498] Added support for HiFiBerry DAC+
The driver is based on the HiFiBerry DAC driver. However HiFiBerry DAC+ uses
a different codec chip (PCM5122), therefore a new driver is necessary.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch
index c0b2e52d..547400c3 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0069-Added-driver-for-HiFiBerry-Amp-amplifier-add-on-boar.patch
@@ -1,7 +1,7 @@
-From 63669829686b2cccf02805bfb57a7d76e48308ae Mon Sep 17 00:00:00 2001
+From 0b2e32ce8372c77632c656349c65822021adb836 Mon Sep 17 00:00:00 2001
From: Daniel Matuschek <info@crazy-audio.com>
Date: Mon, 4 Aug 2014 11:09:58 +0200
-Subject: [PATCH 069/495] Added driver for HiFiBerry Amp amplifier add-on board
+Subject: [PATCH 069/498] Added driver for HiFiBerry Amp amplifier add-on board
The driver contains a low-level hardware driver for the TAS5713 and the
drivers for the Raspberry Pi I2S subsystem.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0070-Add-driver-for-rpi-proto.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0070-Add-driver-for-rpi-proto.patch
index 2980f49e..886d8fbb 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0070-Add-driver-for-rpi-proto.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0070-Add-driver-for-rpi-proto.patch
@@ -1,7 +1,7 @@
-From 6f4c135428dfcc2e4892fde026099179540c4f6b Mon Sep 17 00:00:00 2001
+From 8ac4d07acee43cbc237a65a84477fcdffd265f95 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbrodkorb@conet.de>
Date: Wed, 25 Mar 2015 09:26:17 +0100
-Subject: [PATCH 070/495] Add driver for rpi-proto
+Subject: [PATCH 070/498] Add driver for rpi-proto
Forward port of 3.10.x driver from https://github.com/koalo
We are using a custom board and would like to use rpi 3.18.x
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0071-Add-Support-for-JustBoom-Audio-boards.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0071-Add-Support-for-JustBoom-Audio-boards.patch
index f64b3614..154b049a 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0071-Add-Support-for-JustBoom-Audio-boards.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0071-Add-Support-for-JustBoom-Audio-boards.patch
@@ -1,7 +1,7 @@
-From 1e00b4c122b3bb5a15ceb9627a6133a49626e9d0 Mon Sep 17 00:00:00 2001
+From 690169fd31462005e37d0585973889ad151a0ce1 Mon Sep 17 00:00:00 2001
From: Aaron Shaw <shawaj@gmail.com>
Date: Thu, 7 Apr 2016 21:26:21 +0100
-Subject: [PATCH 071/495] Add Support for JustBoom Audio boards
+Subject: [PATCH 071/498] Add Support for JustBoom Audio boards
justboom-dac: Adjust for ALSA API change
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch
index 7d0deec3..d1a336b7 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0072-New-AudioInjector.net-Pi-soundcard-with-low-jitter-a.patch
@@ -1,7 +1,7 @@
-From 8105dd72afbbbc5ee4cd52e7e14091d84f8e75a4 Mon Sep 17 00:00:00 2001
+From 28112cfe696b51252d9990d00ccae2d0f1f4124f Mon Sep 17 00:00:00 2001
From: Matt Flax <flatmax@flatmax.org>
Date: Mon, 16 May 2016 21:36:31 +1000
-Subject: [PATCH 072/495] New AudioInjector.net Pi soundcard with low jitter
+Subject: [PATCH 072/498] New AudioInjector.net Pi soundcard with low jitter
audio in and out.
Contains the sound/soc/bcm ALSA machine driver and necessary alterations to the Kconfig and Makefile.
@@ -13,15 +13,15 @@ Added support for headphones, microphone and bclk_ratio settings.
This patch adds headphone and microphone capability to the Audio Injector sound card. The patch also sets the bit clock ratio for use in the bcm2835-i2s driver. The bcm2835-i2s can't handle an 8 kHz sample rate when the bit clock is at 12 MHz because its register is only 10 bits wide which can't represent the ch2 offset of 1508. For that reason, the rate constraint is added.
---
- sound/soc/bcm/audioinjector-pi-soundcard.c | 185 +++++++++++++++++++++
- 1 file changed, 185 insertions(+)
+ sound/soc/bcm/audioinjector-pi-soundcard.c | 184 +++++++++++++++++++++
+ 1 file changed, 184 insertions(+)
diff --git a/sound/soc/bcm/audioinjector-pi-soundcard.c b/sound/soc/bcm/audioinjector-pi-soundcard.c
new file mode 100644
-index 000000000000..6fc42570a141
+index 000000000000..e26b67dfbb17
--- /dev/null
+++ b/sound/soc/bcm/audioinjector-pi-soundcard.c
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,184 @@
+/*
+ * ASoC Driver for AudioInjector Pi add on soundcard
+ *
@@ -160,7 +160,7 @@ index 000000000000..6fc42570a141
+{
+ struct snd_soc_card *card = &snd_soc_audioinjector;
+ int ret;
-+
++
+ card->dev = &pdev->dev;
+
+ if (pdev->dev.of_node) {
@@ -206,4 +206,3 @@ index 000000000000..6fc42570a141
+MODULE_DESCRIPTION("AudioInjector.net Pi Soundcard");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:audioinjector-pi-soundcard");
-+
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch
index 0b7b3f1f..671fbcc0 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0073-New-driver-for-RRA-DigiDAC1-soundcard-using-WM8741-W.patch
@@ -1,7 +1,7 @@
-From 6ca5fadf35c43c234b2cb1feec825af0c8bf3fb0 Mon Sep 17 00:00:00 2001
+From 58afce8882d33241fa5478ab1e53cb5e05dfd91c Mon Sep 17 00:00:00 2001
From: escalator2015 <jmtasende@gmail.com>
Date: Tue, 24 May 2016 16:20:09 +0100
-Subject: [PATCH 073/495] New driver for RRA DigiDAC1 soundcard using WM8741 +
+Subject: [PATCH 073/498] New driver for RRA DigiDAC1 soundcard using WM8741 +
WM8804
---
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch
index 65df2b5f..e9d6368c 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0074-Add-support-for-Dion-Audio-LOCO-DAC-AMP-HAT.patch
@@ -1,7 +1,7 @@
-From 29bf1034011f0f17ab4272c48d8a93adaa20cf2d Mon Sep 17 00:00:00 2001
+From 09c8bafbafed515f5b3325c67d320525cb7a23df Mon Sep 17 00:00:00 2001
From: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
Date: Sat, 2 Jul 2016 16:26:19 +0100
-Subject: [PATCH 074/495] Add support for Dion Audio LOCO DAC-AMP HAT
+Subject: [PATCH 074/498] Add support for Dion Audio LOCO DAC-AMP HAT
Using dedicated machine driver and pcm5102a codec driver.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch
index c0835ecd..e2fe8dbd 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0075-Allo-Piano-DAC-boards-Initial-2-channel-stereo-suppo.patch
@@ -1,7 +1,7 @@
-From 172e80ae483bd83732554a0ac7f80e767b76311e Mon Sep 17 00:00:00 2001
+From b31200e812fd2559d2a379082eb8de5284150fd1 Mon Sep 17 00:00:00 2001
From: Clive Messer <clive.m.messer@gmail.com>
Date: Mon, 19 Sep 2016 14:01:04 +0100
-Subject: [PATCH 075/495] Allo Piano DAC boards: Initial 2 channel (stereo)
+Subject: [PATCH 075/498] Allo Piano DAC boards: Initial 2 channel (stereo)
support (#1645)
Add initial 2 channel (stereo) support for Allo Piano DAC (2.0/2.1) boards,
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch
index 54408123..8259d377 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0076-Add-support-for-Allo-Piano-DAC-2.1-plus-add-on-board.patch
@@ -1,7 +1,7 @@
-From 7a619342e79da968d94427ec94b552b4bd75841d Mon Sep 17 00:00:00 2001
+From e4cab9ce0bace4022e491b97fe981f32c433c143 Mon Sep 17 00:00:00 2001
From: Raashid Muhammed <raashidmuhammed@zilogic.com>
Date: Mon, 27 Mar 2017 12:35:00 +0530
-Subject: [PATCH 076/495] Add support for Allo Piano DAC 2.1 plus add-on board
+Subject: [PATCH 076/498] Add support for Allo Piano DAC 2.1 plus add-on board
for Raspberry Pi.
The Piano DAC 2.1 has support for 4 channels with subwoofer.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch
index 7a9627b4..62292e27 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0077-Add-support-for-Allo-Boss-DAC-add-on-board-for-Raspb.patch
@@ -1,7 +1,7 @@
-From d3dba53b442dd07a75096d67081f32ca86ad74a3 Mon Sep 17 00:00:00 2001
+From 696c26bad9133d09ce064555f3f4aa57cf6c28fa Mon Sep 17 00:00:00 2001
From: BabuSubashChandar <babuenir@gmail.com>
Date: Tue, 28 Mar 2017 20:04:42 +0530
-Subject: [PATCH 077/495] Add support for Allo Boss DAC add-on board for
+Subject: [PATCH 077/498] Add support for Allo Boss DAC add-on board for
Raspberry Pi. (#1924)
Signed-off-by: Baswaraj K <jaikumar@cem-solutions.net>
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0078-Support-for-Blokas-Labs-pisound-board.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0078-Support-for-Blokas-Labs-pisound-board.patch
index e243f3c5..52a15267 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0078-Support-for-Blokas-Labs-pisound-board.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0078-Support-for-Blokas-Labs-pisound-board.patch
@@ -1,7 +1,7 @@
-From a040434c0379eaacef35fcf369dbf968b4f7a692 Mon Sep 17 00:00:00 2001
+From eb5e2fcae42dd748afdb499b86cae75a83819c30 Mon Sep 17 00:00:00 2001
From: gtrainavicius <gtrainavicius@users.noreply.github.com>
Date: Sun, 23 Oct 2016 12:06:53 +0300
-Subject: [PATCH 078/495] Support for Blokas Labs pisound board
+Subject: [PATCH 078/498] Support for Blokas Labs pisound board
Pisound dynamic overlay (#1760)
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch
index b0dbef24..7be35fa7 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0079-ASoC-Add-driver-for-Cirrus-Logic-Audio-Card.patch
@@ -1,7 +1,7 @@
-From 0a698cfa8a15af3cfec07f36af9e924af90d1c70 Mon Sep 17 00:00:00 2001
+From 041003011b83b6179d08b33abee81859c3c98d95 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 22 Jan 2017 12:49:37 +0100
-Subject: [PATCH 079/495] ASoC: Add driver for Cirrus Logic Audio Card
+Subject: [PATCH 079/498] ASoC: Add driver for Cirrus Logic Audio Card
Note: due to problems with deferred probing of regulators
the following softdep should be added to a modprobe.d file
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch
index 04679bf6..1b761892 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0080-sound-Support-for-Dion-Audio-LOCO-V2-DAC-AMP-HAT.patch
@@ -1,7 +1,7 @@
-From b42fd6b18dbb257b31b26607dcf79f83f5c02686 Mon Sep 17 00:00:00 2001
+From 63a47bd033a38be15147a33774c9468f16b4fe1b Mon Sep 17 00:00:00 2001
From: Miquel <miquelblauw@hotmail.com>
Date: Fri, 24 Feb 2017 20:51:06 +0100
-Subject: [PATCH 080/495] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT
+Subject: [PATCH 080/498] sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT
Signed-off-by: Miquel Blauw <info@dionaudio.nl>
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch
index c5cce793..8c9a76ba 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0081-Add-support-for-Fe-Pi-audio-sound-card.-1867.patch
@@ -1,7 +1,7 @@
-From ca0d94357d26670f454b24f32aa806e9b376ecde Mon Sep 17 00:00:00 2001
+From 6af0c036aa599480fadfc2164d8288d161344d38 Mon Sep 17 00:00:00 2001
From: Fe-Pi <fe-pi@cox.net>
Date: Wed, 1 Mar 2017 04:42:43 -0700
-Subject: [PATCH 081/495] Add support for Fe-Pi audio sound card. (#1867)
+Subject: [PATCH 081/498] Add support for Fe-Pi audio sound card. (#1867)
Fe-Pi Audio Sound Card is based on NXP SGTL5000 codec.
Mechanical specification of the board is the same the Raspberry Pi Zero.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch
index 70a48e71..697a5442 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0082-Add-support-for-the-AudioInjector.net-Octo-sound-car.patch
@@ -1,7 +1,7 @@
-From 78df2058269ae738c67f707d34924b8e1923f72c Mon Sep 17 00:00:00 2001
+From 1215c2a7f6e5bd0d351c7b279d1f674159538fa3 Mon Sep 17 00:00:00 2001
From: Matt Flax <flatmax@flatmax.org>
Date: Wed, 8 Mar 2017 20:04:13 +1100
-Subject: [PATCH 082/495] Add support for the AudioInjector.net Octo sound card
+Subject: [PATCH 082/498] Add support for the AudioInjector.net Octo sound card
AudioInjector Octo: sample rates, regulators, reset
@@ -34,7 +34,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c
new file mode 100644
-index 000000000000..6029a12d77cc
+index 000000000000..e175daf76026
--- /dev/null
+++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
@@ -0,0 +1,336 @@
@@ -93,7 +93,7 @@ index 000000000000..6029a12d77cc
+ rtd->cpu_dai->driver->capture.channels_min = 8;
+ rtd->cpu_dai->driver->capture.channels_max = 8;
+ rtd->codec_dai->driver->capture.channels_max = 8;
-+
++
+ snd_pcm_hw_constraint_list(substream->runtime, 0,
+ SNDRV_PCM_HW_PARAM_RATE,
+ &audioinjector_octo_constraints);
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0083-Driver-support-for-Google-voiceHAT-soundcard.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0083-Driver-support-for-Google-voiceHAT-soundcard.patch
index e5cbc2fa..28ce1688 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0083-Driver-support-for-Google-voiceHAT-soundcard.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0083-Driver-support-for-Google-voiceHAT-soundcard.patch
@@ -1,7 +1,7 @@
-From a4ad5ab73d012d1fd7c30f5cc6feb8632bd91dff Mon Sep 17 00:00:00 2001
+From 76c429bea35ebd96515ff9f8f11e112cd485f6ea Mon Sep 17 00:00:00 2001
From: Peter Malkin <petermalkin@google.com>
Date: Mon, 27 Mar 2017 16:38:21 -0700
-Subject: [PATCH 083/495] Driver support for Google voiceHAT soundcard.
+Subject: [PATCH 083/498] Driver support for Google voiceHAT soundcard.
ASoC: googlevoicehat-codec: Use correct device when grabbing GPIO
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0084-Driver-and-overlay-for-Allo-Katana-DAC.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0084-Driver-and-overlay-for-Allo-Katana-DAC.patch
index fffdd33f..3e43a89e 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0084-Driver-and-overlay-for-Allo-Katana-DAC.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0084-Driver-and-overlay-for-Allo-Katana-DAC.patch
@@ -1,7 +1,7 @@
-From 0e55893f3079fdcf63eadc2dd4ddf3a4f6994fb2 Mon Sep 17 00:00:00 2001
+From b294c3ff9c248d2678bde8c8da3273551377866c Mon Sep 17 00:00:00 2001
From: allocom <sparky-dev@allo.com>
Date: Thu, 19 Apr 2018 12:12:26 +0530
-Subject: [PATCH 084/495] Driver and overlay for Allo Katana DAC
+Subject: [PATCH 084/498] Driver and overlay for Allo Katana DAC
Allo Katana DAC: Updated default values
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch
index 16703f94..248eed9c 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0085-ASoC-wm8804-MCLK-configuration-options-32-bit.patch
@@ -1,7 +1,7 @@
-From f6903bf39b4f1965c3544569e50325d7ffb8d33d Mon Sep 17 00:00:00 2001
+From d607b1e84c6ebdcb699aa53a2268c3ab12c0c4af Mon Sep 17 00:00:00 2001
From: Daniel Matuschek <info@crazy-audio.com>
Date: Wed, 15 Jan 2014 21:41:23 +0100
-Subject: [PATCH 085/495] ASoC: wm8804: MCLK configuration options, 32-bit
+Subject: [PATCH 085/498] ASoC: wm8804: MCLK configuration options, 32-bit
WM8804 can run with PLL frequencies of 256xfs and 128xfs for most sample
rates. At 192kHz only 128xfs is supported. The existing driver selects
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch
index 5ec21592..3cd7412b 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0086-ASoC-Add-generic-RPI-driver-for-simple-soundcards.patch
@@ -1,7 +1,7 @@
-From 993e4eef165fd47801a67f9dd0cfb3616e69b645 Mon Sep 17 00:00:00 2001
+From 81e1508d7897c7883ac83197d133ad36c4c34e6c Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.org>
Date: Wed, 27 Jun 2018 15:59:12 +0100
-Subject: [PATCH 086/495] ASoC: Add generic RPI driver for simple soundcards.
+Subject: [PATCH 086/498] ASoC: Add generic RPI driver for simple soundcards.
The RPI simple sound card driver provides a generic ALSA SOC card driver
supporting a variety of Pi HAT soundcards. The intention is to avoid
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch
index 8b4db563..20d0ef54 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0087-ASoC-Add-Kconfig-and-Makefile-for-sound-soc-bcm.patch
@@ -1,7 +1,7 @@
-From 2b9b74f5fc2ab6ab57dd75ad40b99ef4fd0a81cc Mon Sep 17 00:00:00 2001
+From a99d5ca2b788a4531b94cb555a5d7cfaecd94c73 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 3 Sep 2018 17:00:36 +0100
-Subject: [PATCH 087/495] ASoC: Add Kconfig and Makefile for sound/soc/bcm
+Subject: [PATCH 087/498] ASoC: Add Kconfig and Makefile for sound/soc/bcm
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch
index cc9ee3a0..18a0adb4 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0088-ASoC-Create-a-generic-Pi-Hat-WM8804-driver.patch
@@ -1,7 +1,7 @@
-From 4533b09fa1771424b65f7561754389879338ccc6 Mon Sep 17 00:00:00 2001
+From 8dc1dd258c77d232d25dc24a83cfe04adedd3943 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.org>
Date: Sat, 21 Jul 2018 20:07:46 +0100
-Subject: [PATCH 088/495] ASoC: Create a generic Pi Hat WM8804 driver
+Subject: [PATCH 088/498] ASoC: Create a generic Pi Hat WM8804 driver
Reduce the amount of duplicated code by creating a generic driver for
Pi Hat digi cards using the WM8804 codec.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0089-rpi_display-add-backlight-driver-and-overlay.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0089-rpi_display-add-backlight-driver-and-overlay.patch
index 94c152ab..56effab4 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0089-rpi_display-add-backlight-driver-and-overlay.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0089-rpi_display-add-backlight-driver-and-overlay.patch
@@ -1,7 +1,7 @@
-From b251c00128ffe98505eb355157faa5a6ed168447 Mon Sep 17 00:00:00 2001
+From c18ceffa2b272fa09ebd221a98058ab9eb4da26a Mon Sep 17 00:00:00 2001
From: P33M <P33M@github.com>
Date: Wed, 21 Oct 2015 14:55:21 +0100
-Subject: [PATCH 089/495] rpi_display: add backlight driver and overlay
+Subject: [PATCH 089/498] rpi_display: add backlight driver and overlay
Add a mailbox-driven backlight controller for the Raspberry Pi DSI
touchscreen display. Requires updated GPU firmware to recognise the
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch
index d1d06e6f..fb3f969f 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0090-bcm2835-virtgpio-Virtual-GPIO-driver.patch
@@ -1,7 +1,7 @@
-From 91a90e546b1ec7e4ea4c2f0ccb1e5be5ea62315d Mon Sep 17 00:00:00 2001
+From 72c3c0f65b18062eb15c39d574deb46c0727ecbe Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 23 Feb 2016 19:56:04 +0000
-Subject: [PATCH 090/495] bcm2835-virtgpio: Virtual GPIO driver
+Subject: [PATCH 090/498] bcm2835-virtgpio: Virtual GPIO driver
Add a virtual GPIO driver that uses the firmware mailbox interface to
request that the VPU toggles LEDs.
diff --git a/sys-kernel/boest-v4.19.42/raspberrypi/0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch b/sys-kernel/boest-v4.19.42/raspberrypi/0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch
index fb61ed06..65fdc3dc 100644
--- a/sys-kernel/boest-v4.19.42/raspberrypi/0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch
+++ b/sys-kernel/boest-v4.19.42/raspberrypi/0091-net-Add-non-mainline-source-for-rtl8192cu-wlan.patch
@@ -1,186 +1,186 @@
-From 278cd0b0dedc2b8c5f271a2bef676eded8cdbd5c Mon Sep 17 00:00:00 2001
+From f84fd969595e6e95da8a84df2be5db399494d2be Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 3 Sep 2012 17:10:23 +0100
-Subject: [PATCH 091/495] net: Add non-mainline source for rtl8192cu wlan
+Subject: [PATCH 091/498] net: Add non-mainline source for rtl8192cu wlan
We are now syncing with version from:
https://github.com/pvaret/rtl8192cu-fixes
---
drivers/net/wireless/realtek/Kconfig | 1 +
drivers/net/wireless/realtek/Makefile | 1 +
- .../net/wireless/realtek/rtl8192cu/Kconfig | 9 +
- .../net/wireless/realtek/rtl8192cu/Makefile | 616 +
+ .../net/wireless/realtek/rtl8192cu/Kconfig | 8 +
+ .../net/wireless/realtek/rtl8192cu/Makefile | 615 +
drivers/net/wireless/realtek/rtl8192cu/clean | 5 +
- .../realtek/rtl8192cu/core/efuse/rtw_efuse.c | 1147 ++
- .../wireless/realtek/rtl8192cu/core/rtw_ap.c | 2943 ++++
+ .../realtek/rtl8192cu/core/efuse/rtw_efuse.c | 1145 ++
+ .../wireless/realtek/rtl8192cu/core/rtw_ap.c | 2942 ++++
.../realtek/rtl8192cu/core/rtw_br_ext.c | 1700 ++
- .../wireless/realtek/rtl8192cu/core/rtw_cmd.c | 3035 ++++
- .../realtek/rtl8192cu/core/rtw_debug.c | 1337 ++
- .../realtek/rtl8192cu/core/rtw_eeprom.c | 423 +
- .../realtek/rtl8192cu/core/rtw_ieee80211.c | 1916 +++
- .../wireless/realtek/rtl8192cu/core/rtw_io.c | 464 +
- .../realtek/rtl8192cu/core/rtw_ioctl_query.c | 196 +
+ .../wireless/realtek/rtl8192cu/core/rtw_cmd.c | 3034 ++++
+ .../realtek/rtl8192cu/core/rtw_debug.c | 1336 ++
+ .../realtek/rtl8192cu/core/rtw_eeprom.c | 422 +
+ .../realtek/rtl8192cu/core/rtw_ieee80211.c | 1915 +++
+ .../wireless/realtek/rtl8192cu/core/rtw_io.c | 462 +
+ .../realtek/rtl8192cu/core/rtw_ioctl_query.c | 195 +
.../realtek/rtl8192cu/core/rtw_ioctl_rtl.c | 1031 ++
- .../realtek/rtl8192cu/core/rtw_ioctl_set.c | 1494 ++
- .../wireless/realtek/rtl8192cu/core/rtw_iol.c | 263 +
- .../realtek/rtl8192cu/core/rtw_mlme.c | 3967 +++++
- .../realtek/rtl8192cu/core/rtw_mlme_ext.c | 13600 ++++++++++++++++
- .../wireless/realtek/rtl8192cu/core/rtw_mp.c | 1324 ++
- .../realtek/rtl8192cu/core/rtw_mp_ioctl.c | 2954 ++++
- .../wireless/realtek/rtl8192cu/core/rtw_p2p.c | 5370 ++++++
- .../realtek/rtl8192cu/core/rtw_pwrctrl.c | 1551 ++
- .../realtek/rtl8192cu/core/rtw_recv.c | 4306 +++++
- .../wireless/realtek/rtl8192cu/core/rtw_rf.c | 95 +
- .../realtek/rtl8192cu/core/rtw_security.c | 3115 ++++
- .../realtek/rtl8192cu/core/rtw_sreset.c | 352 +
- .../realtek/rtl8192cu/core/rtw_sta_mgt.c | 848 +
- .../realtek/rtl8192cu/core/rtw_tdls.c | 2941 ++++
- .../realtek/rtl8192cu/core/rtw_wlan_util.c | 2305 +++
- .../realtek/rtl8192cu/core/rtw_xmit.c | 4156 +++++
- .../realtek/rtl8192cu/hal/HalPwrSeqCmd.c | 177 +
- .../net/wireless/realtek/rtl8192cu/hal/dm.c | 314 +
+ .../realtek/rtl8192cu/core/rtw_ioctl_set.c | 1493 ++
+ .../wireless/realtek/rtl8192cu/core/rtw_iol.c | 262 +
+ .../realtek/rtl8192cu/core/rtw_mlme.c | 3966 +++++
+ .../realtek/rtl8192cu/core/rtw_mlme_ext.c | 13599 ++++++++++++++++
+ .../wireless/realtek/rtl8192cu/core/rtw_mp.c | 1323 ++
+ .../realtek/rtl8192cu/core/rtw_mp_ioctl.c | 2953 ++++
+ .../wireless/realtek/rtl8192cu/core/rtw_p2p.c | 5369 ++++++
+ .../realtek/rtl8192cu/core/rtw_pwrctrl.c | 1549 ++
+ .../realtek/rtl8192cu/core/rtw_recv.c | 4303 +++++
+ .../wireless/realtek/rtl8192cu/core/rtw_rf.c | 94 +
+ .../realtek/rtl8192cu/core/rtw_security.c | 3114 ++++
+ .../realtek/rtl8192cu/core/rtw_sreset.c | 351 +
+ .../realtek/rtl8192cu/core/rtw_sta_mgt.c | 847 +
+ .../realtek/rtl8192cu/core/rtw_tdls.c | 2940 ++++
+ .../realtek/rtl8192cu/core/rtw_wlan_util.c | 2304 +++
+ .../realtek/rtl8192cu/core/rtw_xmit.c | 4155 +++++
+ .../realtek/rtl8192cu/hal/HalPwrSeqCmd.c | 175 +
+ .../net/wireless/realtek/rtl8192cu/hal/dm.c | 313 +
.../net/wireless/realtek/rtl8192cu/hal/dm.h | 30 +
- .../wireless/realtek/rtl8192cu/hal/hal_com.c | 371 +
- .../wireless/realtek/rtl8192cu/hal/hal_intf.c | 546 +
- .../rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c | 1159 ++
- .../rtl8192cu/hal/rtl8192c/rtl8192c_dm.c | 5058 ++++++
- .../hal/rtl8192c/rtl8192c_hal_init.c | 3628 +++++
+ .../wireless/realtek/rtl8192cu/hal/hal_com.c | 370 +
+ .../wireless/realtek/rtl8192cu/hal/hal_intf.c | 545 +
+ .../rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c | 1154 ++
+ .../rtl8192cu/hal/rtl8192c/rtl8192c_dm.c | 5057 ++++++
+ .../hal/rtl8192c/rtl8192c_hal_init.c | 3627 +++++
.../rtl8192cu/hal/rtl8192c/rtl8192c_mp.c | 1207 ++
- .../rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c | 4841 ++++++
- .../rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c | 1031 ++
- .../rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c | 876 +
- .../rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c | 94 +
- .../rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c | 63 +
- .../hal/rtl8192c/usb/Hal8192CUHWImg.c | 8758 ++++++++++
- .../hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c | 2564 +++
- .../hal/rtl8192c/usb/rtl8192cu_led.c | 2680 +++
- .../hal/rtl8192c/usb/rtl8192cu_recv.c | 229 +
- .../hal/rtl8192c/usb/rtl8192cu_xmit.c | 1150 ++
- .../rtl8192cu/hal/rtl8192c/usb/usb_halinit.c | 6261 +++++++
- .../rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c | 1207 ++
- .../hal/rtl8192c/usb/usb_ops_linux.c | 1536 ++
- .../rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c | 1265 ++
+ .../rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c | 4840 ++++++
+ .../rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c | 1030 ++
+ .../rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c | 874 +
+ .../rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c | 93 +
+ .../rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c | 62 +
+ .../hal/rtl8192c/usb/Hal8192CUHWImg.c | 8757 ++++++++++
+ .../hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c | 2557 +++
+ .../hal/rtl8192c/usb/rtl8192cu_led.c | 2679 +++
+ .../hal/rtl8192c/usb/rtl8192cu_recv.c | 227 +
+ .../hal/rtl8192c/usb/rtl8192cu_xmit.c | 1149 ++
+ .../rtl8192cu/hal/rtl8192c/usb/usb_halinit.c | 6260 +++++++
+ .../rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c | 1205 ++
+ .../hal/rtl8192c/usb/usb_ops_linux.c | 1535 ++
+ .../rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c | 1264 ++
.../wireless/realtek/rtl8192cu/ifcfg-wlan0 | 4 +
.../rtl8192cu/include/Hal8192CEHWImg.h | 85 +
- .../rtl8192cu/include/Hal8192CPhyCfg.h | 428 +
- .../rtl8192cu/include/Hal8192CPhyReg.h | 1123 ++
+ .../rtl8192cu/include/Hal8192CPhyCfg.h | 427 +
+ .../rtl8192cu/include/Hal8192CPhyReg.h | 1122 ++
.../rtl8192cu/include/Hal8192CUHWImg.h | 105 +
- .../rtl8192cu/include/Hal8192CUHWImg_wowlan.h | 34 +
+ .../rtl8192cu/include/Hal8192CUHWImg_wowlan.h | 33 +
.../rtl8192cu/include/Hal8192DEHWImg.h | 66 +
- .../rtl8192cu/include/Hal8192DPhyCfg.h | 528 +
- .../rtl8192cu/include/Hal8192DPhyReg.h | 1171 ++
+ .../rtl8192cu/include/Hal8192DPhyCfg.h | 527 +
+ .../rtl8192cu/include/Hal8192DPhyReg.h | 1170 ++
.../rtl8192cu/include/Hal8192DUHWImg.h | 66 +
- .../rtl8192cu/include/Hal8192DUHWImg_wowlan.h | 30 +
+ .../rtl8192cu/include/Hal8192DUHWImg_wowlan.h | 29 +
.../realtek/rtl8192cu/include/HalPwrSeqCmd.h | 137 +
.../realtek/rtl8192cu/include/autoconf.h | 336 +
- .../realtek/rtl8192cu/include/basic_types.h | 321 +
+ .../realtek/rtl8192cu/include/basic_types.h | 320 +
.../rtl8192cu/include/byteorder/big_endian.h | 87 +
.../rtl8192cu/include/byteorder/generic.h | 212 +
.../include/byteorder/little_endian.h | 89 +
.../rtl8192cu/include/byteorder/swab.h | 140 +
.../rtl8192cu/include/byteorder/swabb.h | 156 +
.../realtek/rtl8192cu/include/circ_buf.h | 27 +
- .../realtek/rtl8192cu/include/cmd_osdep.h | 36 +
- .../realtek/rtl8192cu/include/drv_conf.h | 78 +
- .../realtek/rtl8192cu/include/drv_types.h | 662 +
+ .../realtek/rtl8192cu/include/cmd_osdep.h | 35 +
+ .../realtek/rtl8192cu/include/drv_conf.h | 77 +
+ .../realtek/rtl8192cu/include/drv_types.h | 661 +
.../realtek/rtl8192cu/include/drv_types_ce.h | 92 +
- .../rtl8192cu/include/drv_types_linux.h | 25 +
- .../rtl8192cu/include/drv_types_sdio.h | 70 +
- .../realtek/rtl8192cu/include/drv_types_xp.h | 95 +
+ .../rtl8192cu/include/drv_types_linux.h | 24 +
+ .../rtl8192cu/include/drv_types_sdio.h | 69 +
+ .../realtek/rtl8192cu/include/drv_types_xp.h | 94 +
.../realtek/rtl8192cu/include/ethernet.h | 41 +
.../realtek/rtl8192cu/include/h2clbk.h | 35 +
- .../realtek/rtl8192cu/include/hal_com.h | 146 +
- .../realtek/rtl8192cu/include/hal_intf.h | 432 +
- .../realtek/rtl8192cu/include/ieee80211.h | 1580 ++
- .../realtek/rtl8192cu/include/ieee80211_ext.h | 477 +
+ .../realtek/rtl8192cu/include/hal_com.h | 145 +
+ .../realtek/rtl8192cu/include/hal_intf.h | 431 +
+ .../realtek/rtl8192cu/include/ieee80211.h | 1579 ++
+ .../realtek/rtl8192cu/include/ieee80211_ext.h | 476 +
.../realtek/rtl8192cu/include/if_ether.h | 112 +
- .../rtl8192cu/include/ioctl_cfg80211.h | 184 +
+ .../rtl8192cu/include/ioctl_cfg80211.h | 183 +
.../wireless/realtek/rtl8192cu/include/ip.h | 141 +
.../rtl8192cu/include/linux/wireless.h | 90 +
- .../realtek/rtl8192cu/include/mlme_osdep.h | 40 +
+ .../realtek/rtl8192cu/include/mlme_osdep.h | 39 +
.../realtek/rtl8192cu/include/mp_custom_oid.h | 353 +
- .../realtek/rtl8192cu/include/nic_spec.h | 47 +
- .../rtl8192cu/include/osdep_ce_service.h | 171 +
- .../realtek/rtl8192cu/include/osdep_intf.h | 155 +
- .../realtek/rtl8192cu/include/osdep_service.h | 1821 +++
- .../realtek/rtl8192cu/include/pci_hal.h | 168 +
+ .../realtek/rtl8192cu/include/nic_spec.h | 46 +
+ .../rtl8192cu/include/osdep_ce_service.h | 170 +
+ .../realtek/rtl8192cu/include/osdep_intf.h | 154 +
+ .../realtek/rtl8192cu/include/osdep_service.h | 1819 +++
+ .../realtek/rtl8192cu/include/pci_hal.h | 167 +
.../realtek/rtl8192cu/include/pci_ops.h | 60 +
- .../realtek/rtl8192cu/include/pci_osintf.h | 33 +
- .../realtek/rtl8192cu/include/recv_osdep.h | 58 +
- .../realtek/rtl8192cu/include/rtl8192c_cmd.h | 153 +
- .../realtek/rtl8192cu/include/rtl8192c_dm.h | 516 +
- .../rtl8192cu/include/rtl8192c_event.h | 28 +
- .../realtek/rtl8192cu/include/rtl8192c_hal.h | 937 ++
- .../realtek/rtl8192cu/include/rtl8192c_led.h | 42 +
- .../realtek/rtl8192cu/include/rtl8192c_recv.h | 184 +
- .../realtek/rtl8192cu/include/rtl8192c_rf.h | 92 +
- .../realtek/rtl8192cu/include/rtl8192c_spec.h | 1865 +++
+ .../realtek/rtl8192cu/include/pci_osintf.h | 32 +
+ .../realtek/rtl8192cu/include/recv_osdep.h | 57 +
+ .../realtek/rtl8192cu/include/rtl8192c_cmd.h | 152 +
+ .../realtek/rtl8192cu/include/rtl8192c_dm.h | 515 +
+ .../rtl8192cu/include/rtl8192c_event.h | 26 +
+ .../realtek/rtl8192cu/include/rtl8192c_hal.h | 934 ++
+ .../realtek/rtl8192cu/include/rtl8192c_led.h | 41 +
+ .../realtek/rtl8192cu/include/rtl8192c_recv.h | 183 +
+ .../realtek/rtl8192cu/include/rtl8192c_rf.h | 91 +
+ .../realtek/rtl8192cu/include/rtl8192c_spec.h | 1864 +++
.../rtl8192cu/include/rtl8192c_sreset.h | 32 +
- .../realtek/rtl8192cu/include/rtl8192c_xmit.h | 129 +
- .../realtek/rtl8192cu/include/rtl8192d_cmd.h | 142 +
+ .../realtek/rtl8192cu/include/rtl8192c_xmit.h | 128 +
+ .../realtek/rtl8192cu/include/rtl8192d_cmd.h | 140 +
.../realtek/rtl8192cu/include/rtl8192d_dm.h | 420 +
- .../realtek/rtl8192cu/include/rtl8192d_hal.h | 1126 ++
- .../realtek/rtl8192cu/include/rtl8192d_led.h | 43 +
- .../realtek/rtl8192cu/include/rtl8192d_recv.h | 187 +
- .../realtek/rtl8192cu/include/rtl8192d_rf.h | 97 +
- .../realtek/rtl8192cu/include/rtl8192d_spec.h | 1841 +++
- .../realtek/rtl8192cu/include/rtl8192d_xmit.h | 145 +
- .../realtek/rtl8192cu/include/rtw_android.h | 90 +
- .../realtek/rtl8192cu/include/rtw_ap.h | 64 +
- .../realtek/rtl8192cu/include/rtw_br_ext.h | 76 +
- .../realtek/rtl8192cu/include/rtw_byteorder.h | 40 +
- .../realtek/rtl8192cu/include/rtw_cmd.h | 1167 ++
- .../realtek/rtl8192cu/include/rtw_debug.h | 538 +
+ .../realtek/rtl8192cu/include/rtl8192d_hal.h | 1125 ++
+ .../realtek/rtl8192cu/include/rtl8192d_led.h | 42 +
+ .../realtek/rtl8192cu/include/rtl8192d_recv.h | 186 +
+ .../realtek/rtl8192cu/include/rtl8192d_rf.h | 96 +
+ .../realtek/rtl8192cu/include/rtl8192d_spec.h | 1840 +++
+ .../realtek/rtl8192cu/include/rtl8192d_xmit.h | 144 +
+ .../realtek/rtl8192cu/include/rtw_android.h | 89 +
+ .../realtek/rtl8192cu/include/rtw_ap.h | 63 +
+ .../realtek/rtl8192cu/include/rtw_br_ext.h | 75 +
+ .../realtek/rtl8192cu/include/rtw_byteorder.h | 39 +
+ .../realtek/rtl8192cu/include/rtw_cmd.h | 1166 ++
+ .../realtek/rtl8192cu/include/rtw_debug.h | 537 +
.../realtek/rtl8192cu/include/rtw_eeprom.h | 152 +
- .../realtek/rtl8192cu/include/rtw_efuse.h | 124 +
- .../realtek/rtl8192cu/include/rtw_event.h | 154 +
- .../realtek/rtl8192cu/include/rtw_ht.h | 50 +
+ .../realtek/rtl8192cu/include/rtw_efuse.h | 123 +
+ .../realtek/rtl8192cu/include/rtw_event.h | 153 +
+ .../realtek/rtl8192cu/include/rtw_ht.h | 49 +
.../realtek/rtl8192cu/include/rtw_io.h | 504 +
- .../realtek/rtl8192cu/include/rtw_ioctl.h | 269 +
- .../rtl8192cu/include/rtw_ioctl_query.h | 36 +
+ .../realtek/rtl8192cu/include/rtw_ioctl.h | 268 +
+ .../rtl8192cu/include/rtw_ioctl_query.h | 35 +
.../realtek/rtl8192cu/include/rtw_ioctl_rtl.h | 83 +
- .../realtek/rtl8192cu/include/rtw_ioctl_set.h | 79 +
+ .../realtek/rtl8192cu/include/rtw_ioctl_set.h | 78 +
.../realtek/rtl8192cu/include/rtw_iol.h | 89 +
- .../realtek/rtl8192cu/include/rtw_led.h | 217 +
- .../realtek/rtl8192cu/include/rtw_mlme.h | 850 +
- .../realtek/rtl8192cu/include/rtw_mlme_ext.h | 963 ++
- .../realtek/rtl8192cu/include/rtw_mp.h | 712 +
- .../realtek/rtl8192cu/include/rtw_mp_ioctl.h | 596 +
- .../rtl8192cu/include/rtw_mp_phy_regdef.h | 1097 ++
- .../realtek/rtl8192cu/include/rtw_p2p.h | 161 +
+ .../realtek/rtl8192cu/include/rtw_led.h | 216 +
+ .../realtek/rtl8192cu/include/rtw_mlme.h | 849 +
+ .../realtek/rtl8192cu/include/rtw_mlme_ext.h | 962 ++
+ .../realtek/rtl8192cu/include/rtw_mp.h | 711 +
+ .../realtek/rtl8192cu/include/rtw_mp_ioctl.h | 595 +
+ .../rtl8192cu/include/rtw_mp_phy_regdef.h | 1096 ++
+ .../realtek/rtl8192cu/include/rtw_p2p.h | 160 +
.../realtek/rtl8192cu/include/rtw_pwrctrl.h | 362 +
- .../realtek/rtl8192cu/include/rtw_qos.h | 40 +
- .../realtek/rtl8192cu/include/rtw_recv.h | 731 +
- .../realtek/rtl8192cu/include/rtw_rf.h | 152 +
- .../realtek/rtl8192cu/include/rtw_security.h | 447 +
- .../realtek/rtl8192cu/include/rtw_sreset.h | 74 +
- .../realtek/rtl8192cu/include/rtw_tdls.h | 143 +
+ .../realtek/rtl8192cu/include/rtw_qos.h | 39 +
+ .../realtek/rtl8192cu/include/rtw_recv.h | 730 +
+ .../realtek/rtl8192cu/include/rtw_rf.h | 151 +
+ .../realtek/rtl8192cu/include/rtw_security.h | 446 +
+ .../realtek/rtl8192cu/include/rtw_sreset.h | 73 +
+ .../realtek/rtl8192cu/include/rtw_tdls.h | 142 +
.../realtek/rtl8192cu/include/rtw_version.h | 1 +
- .../realtek/rtl8192cu/include/rtw_xmit.h | 754 +
- .../realtek/rtl8192cu/include/sta_info.h | 432 +
- .../realtek/rtl8192cu/include/usb_hal.h | 37 +
- .../realtek/rtl8192cu/include/usb_ops.h | 110 +
- .../realtek/rtl8192cu/include/usb_ops_linux.h | 63 +
- .../realtek/rtl8192cu/include/usb_osintf.h | 38 +
+ .../realtek/rtl8192cu/include/rtw_xmit.h | 753 +
+ .../realtek/rtl8192cu/include/sta_info.h | 431 +
+ .../realtek/rtl8192cu/include/usb_hal.h | 36 +
+ .../realtek/rtl8192cu/include/usb_ops.h | 109 +
+ .../realtek/rtl8192cu/include/usb_ops_linux.h | 62 +
+ .../realtek/rtl8192cu/include/usb_osintf.h | 37 +
.../rtl8192cu/include/usb_vendor_req.h | 59 +
- .../wireless/realtek/rtl8192cu/include/wifi.h | 1248 ++
- .../realtek/rtl8192cu/include/wlan_bssdef.h | 703 +
- .../realtek/rtl8192cu/include/xmit_osdep.h | 95 +
- .../rtl8192cu/os_dep/linux/ioctl_cfg80211.c | 5589 +++++++
- .../rtl8192cu/os_dep/linux/ioctl_linux.c | 11909 ++++++++++++++
- .../rtl8192cu/os_dep/linux/mlme_linux.c | 653 +
- .../realtek/rtl8192cu/os_dep/linux/os_intfs.c | 2768 ++++
- .../realtek/rtl8192cu/os_dep/linux/pci_intf.c | 1997 +++
- .../rtl8192cu/os_dep/linux/pci_ops_linux.c | 24 +
- .../rtl8192cu/os_dep/linux/recv_linux.c | 461 +
- .../rtl8192cu/os_dep/linux/rtw_android.c | 839 +
- .../realtek/rtl8192cu/os_dep/linux/usb_intf.c | 1662 ++
- .../rtl8192cu/os_dep/linux/usb_ops_linux.c | 649 +
- .../rtl8192cu/os_dep/linux/xmit_linux.c | 421 +
- .../realtek/rtl8192cu/os_dep/osdep_service.c | 2300 +++
- drivers/net/wireless/realtek/rtl8192cu/runwpa | 20 +
+ .../wireless/realtek/rtl8192cu/include/wifi.h | 1247 ++
+ .../realtek/rtl8192cu/include/wlan_bssdef.h | 702 +
+ .../realtek/rtl8192cu/include/xmit_osdep.h | 94 +
+ .../rtl8192cu/os_dep/linux/ioctl_cfg80211.c | 5588 +++++++
+ .../rtl8192cu/os_dep/linux/ioctl_linux.c | 11908 ++++++++++++++
+ .../rtl8192cu/os_dep/linux/mlme_linux.c | 652 +
+ .../realtek/rtl8192cu/os_dep/linux/os_intfs.c | 2767 ++++
+ .../realtek/rtl8192cu/os_dep/linux/pci_intf.c | 1996 +++
+ .../rtl8192cu/os_dep/linux/pci_ops_linux.c | 21 +
+ .../rtl8192cu/os_dep/linux/recv_linux.c | 460 +
+ .../rtl8192cu/os_dep/linux/rtw_android.c | 838 +
+ .../realtek/rtl8192cu/os_dep/linux/usb_intf.c | 1661 ++
+ .../rtl8192cu/os_dep/linux/usb_ops_linux.c | 648 +
+ .../rtl8192cu/os_dep/linux/xmit_linux.c | 420 +
+ .../realtek/rtl8192cu/os_dep/osdep_service.c | 2299 +++
+ drivers/net/wireless/realtek/rtl8192cu/runwpa | 18 +
.../net/wireless/realtek/rtl8192cu/wlan0dhcp | 15 +
- 174 files changed, 171743 insertions(+)
+ 174 files changed, 171580 insertions(+)
diff --git a/drivers/net/wireless/realtek/Kconfig b/drivers/net/wireless/realtek/Kconfig
index 3db988e689d7..f28b4520b989 100644
@@ -207,10 +207,10 @@ index 9c78deb5eea9..e5407ed50833 100644
diff --git a/drivers/net/wireless/realtek/rtl8192cu/Kconfig b/drivers/net/wireless/realtek/rtl8192cu/Kconfig
new file mode 100644
-index 000000000000..cd7830bb9d5d
+index 000000000000..47d4465c83f3
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/Kconfig
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,8 @@
+config RTL8192CU
+ tristate "Realtek 8192C USB WiFi"
+ depends on MAC80211 && USB
@@ -219,13 +219,12 @@ index 000000000000..cd7830bb9d5d
+ select WEXT_PRIV
+ ---help---
+ This option adds the Realtek RTL8192CU USB device such as Edimax EW-7811Un.
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/Makefile b/drivers/net/wireless/realtek/rtl8192cu/Makefile
new file mode 100644
-index 000000000000..c399011a3e37
+index 000000000000..bc137ab9f261
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/Makefile
-@@ -0,0 +1,616 @@
+@@ -0,0 +1,615 @@
+EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
+EXTRA_CFLAGS += -O1
+#EXTRA_CFLAGS += -O3
@@ -616,7 +615,7 @@ index 000000000000..c399011a3e37
+endif
+
+ifeq ($(CONFIG_PLATFORM_FS_MX61), y)
-+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
++EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+ARCH := arm
+CROSS_COMPILE := /home/share/CusEnv/FreeScale/arm-eabi-4.4.3/bin/arm-eabi-
+KSRC ?= /home/share/CusEnv/FreeScale/FS_kernel_env
@@ -841,7 +840,6 @@ index 000000000000..c399011a3e37
+ cd os_dep/linux ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko
+ cd os_dep ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko
+endif
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/clean b/drivers/net/wireless/realtek/rtl8192cu/clean
new file mode 100644
index 000000000000..87664218b889
@@ -855,14 +853,14 @@ index 000000000000..87664218b889
+rmmod 8192de
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c b/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c
new file mode 100755
-index 000000000000..3d341accc9aa
+index 000000000000..c7f2b6705105
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c
-@@ -0,0 +1,1147 @@
+@@ -0,0 +1,1145 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -961,7 +959,7 @@ index 000000000000..3d341accc9aa
+/*-----------------------------------------------------------------------------
+ * Function: Efuse_PowerSwitch
+ *
-+ * Overview: When we want to enable write operation, we should change to
++ * Overview: When we want to enable write operation, we should change to
+ * pwr on state. When we stop write, we should switch to 500k mode
+ * and disable LDO 2.5V.
+ *
@@ -983,7 +981,7 @@ index 000000000000..3d341accc9aa
+ IN u8 PwrState)
+{
+ pAdapter->HalFunc.EfusePowerSwitch(pAdapter, bWrite, PwrState);
-+}
++}
+
+/*-----------------------------------------------------------------------------
+ * Function: efuse_GetCurrentSize
@@ -1040,9 +1038,9 @@ index 000000000000..3d341accc9aa
+VOID
+ReadEFuseByte(
+ PADAPTER Adapter,
-+ u16 _offset,
-+ u8 *pbuf,
-+ IN BOOLEAN bPseudoTest)
++ u16 _offset,
++ u8 *pbuf,
++ IN BOOLEAN bPseudoTest)
+{
+ u32 value32;
+ u8 readbyte;
@@ -1056,14 +1054,14 @@ index 000000000000..3d341accc9aa
+ }
+
+ //Write Address
-+ rtw_write8(Adapter, EFUSE_CTRL+1, (_offset & 0xff));
++ rtw_write8(Adapter, EFUSE_CTRL+1, (_offset & 0xff));
+ readbyte = rtw_read8(Adapter, EFUSE_CTRL+2);
-+ rtw_write8(Adapter, EFUSE_CTRL+2, ((_offset >> 8) & 0x03) | (readbyte & 0xfc));
++ rtw_write8(Adapter, EFUSE_CTRL+2, ((_offset >> 8) & 0x03) | (readbyte & 0xfc));
+
+ //Write bit 32 0
-+ readbyte = rtw_read8(Adapter, EFUSE_CTRL+3);
-+ rtw_write8(Adapter, EFUSE_CTRL+3, (readbyte & 0x7f));
-+
++ readbyte = rtw_read8(Adapter, EFUSE_CTRL+3);
++ rtw_write8(Adapter, EFUSE_CTRL+3, (readbyte & 0x7f));
++
+ //Check bit 32 read-ready
+ retry = 0;
+ value32 = rtw_read32(Adapter, EFUSE_CTRL);
@@ -1080,16 +1078,16 @@ index 000000000000..3d341accc9aa
+ // result will always stay on last data we read.
+ rtw_udelay_os(50);
+ value32 = rtw_read32(Adapter, EFUSE_CTRL);
-+
++
+ *pbuf = (u8)(value32 & 0xff);
+ //DBG_871X("ReadEFuseByte _offset:%08u, in %d ms\n",_offset ,rtw_get_passing_time_ms(start));
-+
++
+}
+
+
+//
+// Description:
-+// 1. Execute E-Fuse read byte operation according as map offset and
++// 1. Execute E-Fuse read byte operation according as map offset and
+// save to E-Fuse table.
+// 2. Refered from SD1 Richard.
+//
@@ -1156,8 +1154,8 @@ index 000000000000..3d341accc9aa
+ *
+ *---------------------------------------------------------------------------*/
+u8
-+EFUSE_Read1Byte(
-+ IN PADAPTER Adapter,
++EFUSE_Read1Byte(
++ IN PADAPTER Adapter,
+ IN u16 Address)
+{
+ u8 data;
@@ -1171,12 +1169,12 @@ index 000000000000..3d341accc9aa
+ if (Address < contentLen) //E-fuse 512Byte
+ {
+ //Write E-fuse Register address bit0~7
-+ temp = Address & 0xFF;
-+ rtw_write8(Adapter, EFUSE_CTRL+1, temp);
-+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2);
++ temp = Address & 0xFF;
++ rtw_write8(Adapter, EFUSE_CTRL+1, temp);
++ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2);
+ //Write E-fuse Register address bit8~9
-+ temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC);
-+ rtw_write8(Adapter, EFUSE_CTRL+2, temp);
++ temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC);
++ rtw_write8(Adapter, EFUSE_CTRL+2, temp);
+
+ //Write 0x30[31]=0
+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
@@ -1186,7 +1184,7 @@ index 000000000000..3d341accc9aa
+ //Wait Write-ready (0x30[31]=1)
+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
+ while(!(Bytetemp & 0x80))
-+ {
++ {
+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
+ k++;
+ if(k==1000)
@@ -1200,7 +1198,7 @@ index 000000000000..3d341accc9aa
+ }
+ else
+ return 0xFF;
-+
++
+}/* EFUSE_Read1Byte */
+
+/*-----------------------------------------------------------------------------
@@ -1220,14 +1218,14 @@ index 000000000000..3d341accc9aa
+ *
+ *---------------------------------------------------------------------------*/
+
-+void
-+EFUSE_Write1Byte(
-+ IN PADAPTER Adapter,
++void
++EFUSE_Write1Byte(
++ IN PADAPTER Adapter,
+ IN u16 Address,
+ IN u8 Value);
-+void
-+EFUSE_Write1Byte(
-+ IN PADAPTER Adapter,
++void
++EFUSE_Write1Byte(
++ IN PADAPTER Adapter,
+ IN u16 Address,
+ IN u8 Value)
+{
@@ -1244,13 +1242,13 @@ index 000000000000..3d341accc9aa
+ rtw_write8(Adapter, EFUSE_CTRL, Value);
+
+ //Write E-fuse Register address bit0~7
-+ temp = Address & 0xFF;
-+ rtw_write8(Adapter, EFUSE_CTRL+1, temp);
-+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2);
-+
++ temp = Address & 0xFF;
++ rtw_write8(Adapter, EFUSE_CTRL+1, temp);
++ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2);
++
+ //Write E-fuse Register address bit8~9
-+ temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC);
-+ rtw_write8(Adapter, EFUSE_CTRL+2, temp);
++ temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC);
++ rtw_write8(Adapter, EFUSE_CTRL+2, temp);
+
+ //Write 0x30[31]=1
+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
@@ -1261,7 +1259,7 @@ index 000000000000..3d341accc9aa
+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
+ while(Bytetemp & 0x80)
+ {
-+ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
++ Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
+ k++;
+ if(k==100)
+ {
@@ -1275,7 +1273,7 @@ index 000000000000..3d341accc9aa
+/* 11/16/2008 MH Read one byte from real Efuse. */
+u8
+efuse_OneByteRead(
-+ IN PADAPTER pAdapter,
++ IN PADAPTER pAdapter,
+ IN u16 addr,
+ IN u8 *data,
+ IN BOOLEAN bPseudoTest)
@@ -1289,35 +1287,35 @@ index 000000000000..3d341accc9aa
+ return bResult;
+ }
+ // -----------------e-fuse reg ctrl ---------------------------------
-+ //address
-+ rtw_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr&0xff));
-+ rtw_write8(pAdapter, EFUSE_CTRL+2, ((u8)((addr>>8) &0x03) ) |
-+ (rtw_read8(pAdapter, EFUSE_CTRL+2)&0xFC ));
++ //address
++ rtw_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr&0xff));
++ rtw_write8(pAdapter, EFUSE_CTRL+2, ((u8)((addr>>8) &0x03) ) |
++ (rtw_read8(pAdapter, EFUSE_CTRL+2)&0xFC ));
+
-+ rtw_write8(pAdapter, EFUSE_CTRL+3, 0x72);//read cmd
++ rtw_write8(pAdapter, EFUSE_CTRL+3, 0x72);//read cmd
+
+ while(!(0x80 &rtw_read8(pAdapter, EFUSE_CTRL+3))&&(tmpidx<100))
+ {
+ tmpidx++;
+ }
+ if(tmpidx<100)
-+ {
-+ *data=rtw_read8(pAdapter, EFUSE_CTRL);
++ {
++ *data=rtw_read8(pAdapter, EFUSE_CTRL);
+ bResult = _TRUE;
+ }
+ else
+ {
-+ *data = 0xff;
++ *data = 0xff;
+ bResult = _FALSE;
+ }
+ return bResult;
+}
-+
++
+/* 11/16/2008 MH Write one byte to reald Efuse. */
+u8
+efuse_OneByteWrite(
-+ IN PADAPTER pAdapter,
-+ IN u16 addr,
++ IN PADAPTER pAdapter,
++ IN u16 addr,
+ IN u8 data,
+ IN BOOLEAN bPseudoTest)
+{
@@ -1333,29 +1331,29 @@ index 000000000000..3d341accc9aa
+
+ //return 0;
+
-+ // -----------------e-fuse reg ctrl ---------------------------------
-+ //address
++ // -----------------e-fuse reg ctrl ---------------------------------
++ //address
+ rtw_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr&0xff));
-+ rtw_write8(pAdapter, EFUSE_CTRL+2,
-+ (rtw_read8(pAdapter, EFUSE_CTRL+2)&0xFC )|(u8)((addr>>8)&0x03) );
-+ rtw_write8(pAdapter, EFUSE_CTRL, data);//data
++ rtw_write8(pAdapter, EFUSE_CTRL+2,
++ (rtw_read8(pAdapter, EFUSE_CTRL+2)&0xFC )|(u8)((addr>>8)&0x03) );
++ rtw_write8(pAdapter, EFUSE_CTRL, data);//data
+
+ rtw_write8(pAdapter, EFUSE_CTRL+3, 0xF2);//write cmd
-+
++
+ while((0x80 & rtw_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx<100) ){
+ tmpidx++;
+ }
-+
++
+ if(tmpidx<100)
-+ {
++ {
+ bResult = _TRUE;
+ }
+ else
-+ {
++ {
+ bResult = _FALSE;
-+ }
-+
-+ return bResult;
++ }
++
++ return bResult;
+}
+
+int
@@ -1371,8 +1369,8 @@ index 000000000000..3d341accc9aa
+ return ret;
+}
+
-+int
-+Efuse_PgPacketWrite(IN PADAPTER pAdapter,
++int
++Efuse_PgPacketWrite(IN PADAPTER pAdapter,
+ IN u8 offset,
+ IN u8 word_en,
+ IN u8 *data,
@@ -1406,7 +1404,7 @@ index 000000000000..3d341accc9aa
+efuse_WordEnableDataRead(IN u8 word_en,
+ IN u8 *sourdata,
+ IN u8 *targetdata)
-+{
++{
+ if (!(word_en&BIT(0)))
+ {
+ targetdata[0] = sourdata[0];
@@ -1433,14 +1431,14 @@ index 000000000000..3d341accc9aa
+u8
+Efuse_WordEnableDataWrite( IN PADAPTER pAdapter,
+ IN u16 efuse_addr,
-+ IN u8 word_en,
++ IN u8 word_en,
+ IN u8 *data,
+ IN BOOLEAN bPseudoTest)
+{
+ u8 ret=0;
+
+ ret = pAdapter->HalFunc.Efuse_WordEnableDataWrite(pAdapter, efuse_addr, word_en, data, bPseudoTest);
-+
++
+ return ret;
+}
+
@@ -1642,15 +1640,15 @@ index 000000000000..3d341accc9aa
+ * 11/11/2008 MHC Create Version 0.
+ *
+ *---------------------------------------------------------------------------*/
-+VOID
++VOID
+Efuse_ReadAllMap(
-+ IN PADAPTER pAdapter,
++ IN PADAPTER pAdapter,
+ IN u8 efuseType,
+ IN OUT u8 *Efuse,
+ IN BOOLEAN bPseudoTest);
-+VOID
++VOID
+Efuse_ReadAllMap(
-+ IN PADAPTER pAdapter,
++ IN PADAPTER pAdapter,
+ IN u8 efuseType,
+ IN OUT u8 *Efuse,
+ IN BOOLEAN bPseudoTest)
@@ -1826,19 +1824,19 @@ index 000000000000..3d341accc9aa
+ }
+ else
+ {
-+ #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE
++ #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE
+ if(_SUCCESS != retriveAdaptorInfoFile(pAdapter->registrypriv.adaptor_info_caching_file_path, pEEPROM)) {
+ #endif
-+
++
+ Efuse_ReadAllMap(pAdapter, efuseType, pEEPROM->efuse_eeprom_data, bPseudoTest);
-+
++
+ #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE
+ storeAdaptorInfoFile(pAdapter->registrypriv.adaptor_info_caching_file_path, pEEPROM);
+ }
+ #endif
+ }
+
-+ //PlatformMoveMemory((PVOID)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0],
++ //PlatformMoveMemory((PVOID)&pHalData->EfuseMap[EFUSE_MODIFY_MAP][0],
+ //(PVOID)&pHalData->EfuseMap[EFUSE_INIT_MAP][0], mapLen);
+}// EFUSE_ShadowMapUpdate
+
@@ -1872,7 +1870,7 @@ index 000000000000..3d341accc9aa
+ efuse_ShadowRead2Byte(pAdapter, Offset, (u16 *)Value);
+ else if (Type == 4)
+ efuse_ShadowRead4Byte(pAdapter, Offset, (u32 *)Value);
-+
++
+} // EFUSE_ShadowRead
+
+/*-----------------------------------------------------------------------------
@@ -1927,7 +1925,7 @@ index 000000000000..3d341accc9aa
+ )
+{
+ u8 i;
-+
++
+ _rtw_memset((PVOID)&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE);
+ _rtw_memset((PVOID)&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN);
+ _rtw_memset((PVOID)&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN);
@@ -1978,24 +1976,24 @@ index 000000000000..3d341accc9aa
+ int ret = _SUCCESS;
+ mm_segment_t oldfs;
+ struct file *fp;
-+
++
+ if(path && eeprom_priv) {
+
+ ret = rtw_retrive_from_file(path, eeprom_priv->efuse_eeprom_data, EEPROM_MAX_SIZE);
-+
++
+ if(ret == EEPROM_MAX_SIZE)
+ ret = _SUCCESS;
+ else
+ ret = _FAIL;
+
+ #if 0
-+ if(isAdaptorInfoFileValid()) {
++ if(isAdaptorInfoFileValid()) {
+ return 0;
+ } else {
+ return _FAIL;
+ }
+ #endif
-+
++
+ } else {
+ DBG_871X("%s NULL pointer\n",__FUNCTION__);
+ ret = _FAIL;
@@ -2004,18 +2002,16 @@ index 000000000000..3d341accc9aa
+}
+#endif //CONFIG_ADAPTOR_INFO_CACHING_FILE
+#endif //PLATFORM_LINUX
-+
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c
new file mode 100755
-index 000000000000..14576dd191f3
+index 000000000000..e2403d2bc325
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c
-@@ -0,0 +1,2943 @@
+@@ -0,0 +1,2942 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -2051,13 +2047,13 @@ index 000000000000..14576dd191f3
+{
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+ struct sta_priv *pstapriv = &padapter->stapriv;
++ struct sta_priv *pstapriv = &padapter->stapriv;
+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-+
+
-+ _rtw_spinlock_init(&pmlmepriv->bcn_update_lock);
+
-+ //for ACL
++ _rtw_spinlock_init(&pmlmepriv->bcn_update_lock);
++
++ //for ACL
+ _rtw_init_queue(&pacl_list->acl_node_q);
+
+ //pmlmeext->bstart_bss = _FALSE;
@@ -2077,8 +2073,8 @@ index 000000000000..14576dd191f3
+ //stop_ap_mode(padapter);
+
+ pmlmepriv->update_bcn = _FALSE;
-+ pmlmeext->bstart_bss = _FALSE;
-+
++ pmlmeext->bstart_bss = _FALSE;
++
+ rtw_sta_flush(padapter);
+
+ pmlmeinfo->state = _HW_STATE_NOLINK_;
@@ -2087,14 +2083,14 @@ index 000000000000..14576dd191f3
+ rtw_free_all_stainfo(padapter);
+
+ //free bc/mc sta_info
-+ psta = rtw_get_bcmc_stainfo(padapter);
-+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
++ psta = rtw_get_bcmc_stainfo(padapter);
++ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
+ rtw_free_stainfo(padapter, psta);
+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
-+
++
+
+ _rtw_spinlock_free(&pmlmepriv->bcn_update_lock);
-+
++
+}
+
+static void update_BCNTIM(_adapter *padapter)
@@ -2106,26 +2102,26 @@ index 000000000000..14576dd191f3
+ unsigned char *pie = pnetwork_mlmeext->IEs;
+
+ //DBG_871X("%s\n", __FUNCTION__);
-+
++
+ //update TIM IE
+ //if(pstapriv->tim_bitmap)
+ if(_TRUE)
+ {
+ u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
+ u16 tim_bitmap_le;
-+ uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
-+
++ uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
++
+ tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
+
+ p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen, pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_);
+ if (p != NULL && tim_ielen>0)
+ {
+ tim_ielen += 2;
-+
++
+ premainder_ie = p+tim_ielen;
+
+ tim_ie_offset = (sint)(p -pie);
-+
++
+ remainder_ielen = pnetwork_mlmeext->IELength - tim_ie_offset - tim_ielen;
+
+ //append TIM IE from dst_ie offset
@@ -2135,7 +2131,7 @@ index 000000000000..14576dd191f3
+ {
+ tim_ielen = 0;
+
-+ //calucate head_len
++ //calucate head_len
+ offset = _FIXED_IE_LENGTH_;
+
+ /* get ssid_ie len */
@@ -2144,73 +2140,73 @@ index 000000000000..14576dd191f3
+ offset += tmp_len+2;
+
+ // get supported rates len
-+ p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_));
-+ if (p != NULL)
-+ {
++ p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_));
++ if (p != NULL)
++ {
+ offset += tmp_len+2;
+ }
+
-+ //DS Parameter Set IE, len=3
++ //DS Parameter Set IE, len=3
+ offset += 3;
+
+ premainder_ie = pie + offset;
+
-+ remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen;
++ remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen;
+
+ //append TIM IE from offset
+ dst_ie = pie + offset;
-+
++
+ }
+
-+
++
+ if(remainder_ielen>0)
+ {
+ pbackup_remainder_ie = rtw_malloc(remainder_ielen);
+ if(pbackup_remainder_ie && premainder_ie)
+ _rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
-+ }
++ }
+
+ *dst_ie++=_TIM_IE_;
+
-+ if((pstapriv->tim_bitmap&0xff00) && (pstapriv->tim_bitmap&0x00fc))
++ if((pstapriv->tim_bitmap&0xff00) && (pstapriv->tim_bitmap&0x00fc))
+ tim_ielen = 5;
+ else
+ tim_ielen = 4;
+
+ *dst_ie++= tim_ielen;
-+
++
+ *dst_ie++=0;//DTIM count
+ *dst_ie++=1;//DTIM peroid
-+
++
+ if(pstapriv->tim_bitmap&BIT(0))//for bc/mc frames
-+ *dst_ie++ = BIT(0);//bitmap ctrl
++ *dst_ie++ = BIT(0);//bitmap ctrl
+ else
+ *dst_ie++ = 0;
+
+ if(tim_ielen==4)
+ {
+ *dst_ie++ = *(u8*)&tim_bitmap_le;
-+ }
++ }
+ else if(tim_ielen==5)
+ {
+ _rtw_memcpy(dst_ie, &tim_bitmap_le, 2);
-+ dst_ie+=2;
-+ }
-+
++ dst_ie+=2;
++ }
++
+ //copy remainder IE
+ if(pbackup_remainder_ie)
+ {
+ _rtw_memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
+
+ rtw_mfree(pbackup_remainder_ie, remainder_ielen);
-+ }
++ }
+
+ offset = (uint)(dst_ie - pie);
+ pnetwork_mlmeext->IELength = offset + remainder_ielen;
-+
++
+ }
+
-+#ifndef CONFIG_INTERRUPT_BASED_TXBCN
++#ifndef CONFIG_INTERRUPT_BASED_TXBCN
+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
+ set_tx_beacon_cmd(padapter);
+#endif
@@ -2251,11 +2247,11 @@ index 000000000000..14576dd191f3
+ if (p != NULL && ielen>0)
+ {
+ ielen += 2;
-+
++
+ premainder_ie = p+ielen;
+
+ ie_offset = (sint)(p -pie);
-+
++
+ remainder_ielen = pnetwork->IELength - ie_offset - ielen;
+
+ if(bmatch)
@@ -2302,11 +2298,11 @@ index 000000000000..14576dd191f3
+ if (p != NULL && ielen>0)
+ {
+ ielen += 2;
-+
++
+ premainder_ie = p+ielen;
+
+ ie_offset = (sint)(p -pie);
-+
++
+ remainder_ielen = pnetwork->IELength - ie_offset - ielen;
+
+ dst_ie = p;
@@ -2375,14 +2371,14 @@ index 000000000000..14576dd191f3
+ _irqL irqL;
+ _list *phead, *plist;
+ u8 updated = _FALSE;
-+ struct sta_info *psta=NULL;
++ struct sta_info *psta=NULL;
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ u8 chk_alive_num = 0;
+ char chk_alive_list[NUM_STA];
+ int i;
+
+ _enter_critical_bh(&pstapriv->auth_list_lock, &irqL);
-+
++
+ phead = &pstapriv->auth_list;
+ plist = get_next(phead);
+
@@ -2393,41 +2389,41 @@ index 000000000000..14576dd191f3
+ , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt);
+ }
+ #endif
-+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
++ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
+ {
+ psta = LIST_CONTAINOR(plist, struct sta_info, auth_list);
+ plist = get_next(plist);
-+
++
+ if(psta->expire_to>0)
+ {
+ psta->expire_to--;
+ if (psta->expire_to == 0)
-+ {
++ {
+ rtw_list_delete(&psta->auth_list);
+ pstapriv->auth_list_cnt--;
-+
++
+ DBG_871X("auth expire %02X%02X%02X%02X%02X%02X\n",
+ psta->hwaddr[0],psta->hwaddr[1],psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]);
-+
++
+ _exit_critical_bh(&pstapriv->auth_list_lock, &irqL);
-+
-+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
++
++ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
+ rtw_free_stainfo(padapter, psta);
-+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
-+
++ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
++
+ _enter_critical_bh(&pstapriv->auth_list_lock, &irqL);
-+ }
-+ }
-+
++ }
++ }
++
+ }
+
+ _exit_critical_bh(&pstapriv->auth_list_lock, &irqL);
+
+ psta = NULL;
-+
++
+
+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
-+
++
+ phead = &pstapriv->asoc_list;
+ plist = get_next(phead);
+
@@ -2442,7 +2438,7 @@ index 000000000000..14576dd191f3
+ {
+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
+ plist = get_next(plist);
-+
++
+ if (chk_sta_is_alive(psta) || !psta->expire_to) {
+ psta->expire_to = pstapriv->expire_to;
+ psta->keep_alive_trycnt = 0;
@@ -2456,10 +2452,10 @@ index 000000000000..14576dd191f3
+#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
+#ifdef CONFIG_TX_MCAST2UNI
+ if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) {
-+ // check sta by delba(addba) for 11n STA
++ // check sta by delba(addba) for 11n STA
+ // ToDo: use CCX report to check for all STAs
+ //DBG_871X("asoc check by DELBA/ADDBA! (pstapriv->expire_to=%d s)(psta->expire_to=%d s), [%02x, %d]\n", pstapriv->expire_to*2, psta->expire_to*2, psta->htpriv.agg_enable_bitmap, psta->under_exist_checking);
-+
++
+ if ( psta->expire_to <= (pstapriv->expire_to - 50 ) ) {
+ DBG_871X("asoc expire by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
+ psta->under_exist_checking = 0;
@@ -2489,7 +2485,7 @@ index 000000000000..14576dd191f3
+
+ if (psta->state & WIFI_SLEEP_STATE) {
+ if (!(psta->state & WIFI_STA_ALIVE_CHK_STATE)) {
-+ //to check if alive by another methods if staion is at ps mode.
++ //to check if alive by another methods if staion is at ps mode.
+ psta->expire_to = pstapriv->expire_to;
+ psta->state |= WIFI_STA_ALIVE_CHK_STATE;
+
@@ -2521,7 +2517,7 @@ index 000000000000..14576dd191f3
+
+ DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
+ updated = ap_free_sta(padapter, psta, _FALSE, WLAN_REASON_DEAUTH_LEAVING);
-+ }
++ }
+ else
+ {
+ /* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */
@@ -2551,12 +2547,12 @@ index 000000000000..14576dd191f3
+
+ /* issue null data to check sta alive*/
+ for (i = 0; i < chk_alive_num; i++) {
-+
++
+ int ret = _FAIL;
+
+ psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
+ if(!(psta->state &_FW_LINKED))
-+ continue;
++ continue;
+
+ if (psta->state & WIFI_SLEEP_STATE)
+ ret = issue_nulldata(padapter, psta->hwaddr, 0, 1, 50);
@@ -2601,24 +2597,24 @@ index 000000000000..14576dd191f3
+
+
+static void add_RATid(_adapter *padapter, struct sta_info *psta)
-+{
++{
+ int i;
+ u8 rf_type;
+ u32 init_rate=0;
+ unsigned char sta_band = 0, raid, shortGIrate = _FALSE;
-+ unsigned char limit;
++ unsigned char limit;
+ unsigned int tx_ra_bitmap=0;
+ struct ht_priv *psta_ht = NULL;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+ WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
++ WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
++
+ +
-+
+ if(psta)
+ psta_ht = &psta->htpriv;
+ else
+ return;
-+
-+ //b/g mode ra_bitmap
++
++ //b/g mode ra_bitmap
+ for (i=0; i<sizeof(psta->bssrateset); i++)
+ {
+ if (psta->bssrateset[i])
@@ -2626,7 +2622,7 @@ index 000000000000..14576dd191f3
+ }
+ +
+ //n mode ra_bitmap
-+ if(psta_ht->ht_option)
++ if(psta_ht->ht_option)
+ {
+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
+ if(rf_type == RF_2T2R)
@@ -2658,8 +2654,8 @@ index 000000000000..14576dd191f3
+ Switch_1SS_Antenna(priv, 3);
+ }
+ }
-+ else// bg or 1R STA?
-+ {
++ else// bg or 1R STA?
++ {
+ if((priv->pmib->dot11BssType.net_work_type & WIRELESS_11N) && pstat->ht_cap_len && priv->pshare->has_2r_sta == 0)
+ {
+ if(rtw_read16(padapter, 0x102501f6) != 0x7777)
@@ -2670,10 +2666,10 @@ index 000000000000..14576dd191f3
+ }
+ }
+ }
-+
++
+ }
+
-+ if ((pstat->rssi_level < 1) || (pstat->rssi_level > 3))
++ if ((pstat->rssi_level < 1) || (pstat->rssi_level > 3))
+ {
+ if (pstat->rssi >= priv->pshare->rf_ft_var.raGoDownUpper)
+ pstat->rssi_level = 1;
@@ -2707,7 +2703,7 @@ index 000000000000..14576dd191f3
+ break;
+ }
+ }
-+ else
++ else
+ {
+ switch (pstat->rssi_level) {
+ case 1:
@@ -2748,7 +2744,7 @@ index 000000000000..14576dd191f3
+ break;
+ }
+ }
-+ else
++ else
+ {
+ pstat->tx_ra_bitmap &= 0x0000000d;
+ }
@@ -2759,7 +2755,7 @@ index 000000000000..14576dd191f3
+ if ((!(pstat->tx_ra_bitmap & 0x8000000) && (priv->pshare->has_2r_sta > 0) && (get_rf_mimo_mode(padapter) == RTL8712_RF_2T2R)) ||
+ (!(pstat->tx_ra_bitmap & 0x80000) && (get_rf_mimo_mode(padapter) != RTL8712_RF_2T2R)))
+ {
-+ pstat->tx_ra_bitmap &= ~BIT(28);
++ pstat->tx_ra_bitmap &= ~BIT(28);
+ }
+#endif
+
@@ -2778,23 +2774,23 @@ index 000000000000..14576dd191f3
+ sta_band |= WIRELESS_11B;
+ }
+
-+ raid = networktype_to_raid(sta_band);
++ raid = networktype_to_raid(sta_band);
+ init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f;
-+
-+ if (psta->aid < NUM_STA)
++
++ if (psta->aid < NUM_STA)
+ {
+ u8 arg = 0;
+
+ arg = psta->mac_id&0x1f;
-+
++
+ arg |= BIT(7);//support entry 2~31
-+
++
+ if (shortGIrate==_TRUE)
+ arg |= BIT(5);
+
+ tx_ra_bitmap |= ((raid<<28)&0xf0000000);
+
-+ DBG_871X("%s=> mac_id:%d , raid:%d , bitmap=0x%x, arg=0x%x\n",
++ DBG_871X("%s=> mac_id:%d , raid:%d , bitmap=0x%x, arg=0x%x\n",
+ __FUNCTION__ , psta->mac_id, raid ,tx_ra_bitmap, arg);
+
+ //bitmap[0:27] = tx_rate_bitmap
@@ -2805,13 +2801,13 @@ index 000000000000..14576dd191f3
+
+ if (shortGIrate==_TRUE)
+ init_rate |= BIT(6);
-+
++
+ //set ra_id, init_rate
+ psta->raid = raid;
+ psta->init_rate = init_rate;
-+
++
+ }
-+ else
++ else
+ {
+ DBG_871X("station aid %d exceed the max number\n", psta->aid);
+ }
@@ -2823,19 +2819,19 @@ index 000000000000..14576dd191f3
+ _irqL irqL;
+ u32 init_rate=0;
+ unsigned char network_type, raid;
-+ int i, supportRateNum = 0;
++ int i, supportRateNum = 0;
+ unsigned int tx_ra_bitmap=0;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+ WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
++ WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
+ struct sta_info *psta = rtw_get_bcmc_stainfo(padapter);
+
+ if(psta)
+ {
+ psta->aid = 0;//default set to 0
-+ //psta->mac_id = psta->aid+4;
++ //psta->mac_id = psta->aid+4;
+ psta->mac_id = psta->aid + 1;
+
-+ psta->qos_option = 0;
++ psta->qos_option = 0;
+ psta->htpriv.ht_option = _FALSE;
+
+ psta->ieee8021x_blocked = 0;
@@ -2846,16 +2842,16 @@ index 000000000000..14576dd191f3
+
+
+
-+ //prepare for add_RATid
++ //prepare for add_RATid
+ supportRateNum = rtw_get_rateset_len((u8*)&pcur_network->SupportedRates);
+ network_type = rtw_check_network_type((u8*)&pcur_network->SupportedRates, supportRateNum, 1);
-+
++
+ _rtw_memcpy(psta->bssrateset, &pcur_network->SupportedRates, supportRateNum);
+ psta->bssratelen = supportRateNum;
+
-+ //b/g mode ra_bitmap
++ //b/g mode ra_bitmap
+ for (i=0; i<supportRateNum; i++)
-+ {
++ {
+ if (psta->bssrateset[i])
+ tx_ra_bitmap |= rtw_get_bit_value_from_ieee_value(psta->bssrateset[i]&0x7f);
+ }
@@ -2865,16 +2861,16 @@ index 000000000000..14576dd191f3
+ network_type = WIRELESS_11A;
+ tx_ra_bitmap = 0x150; // 6, 12, 24 Mbps
+ } else {
-+ //force to b mode
++ //force to b mode
+ network_type = WIRELESS_11B;
-+ tx_ra_bitmap = 0xf;
++ tx_ra_bitmap = 0xf;
+ }
+
+ //tx_ra_bitmap = update_basic_rate(pcur_network->SupportedRates, supportRateNum);
+
+ raid = networktype_to_raid(network_type);
+ init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f;
-+
++
+ //DBG_871X("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap);
+
+ //if(pHalData->fw_ractrl == _TRUE)
@@ -2882,13 +2878,13 @@ index 000000000000..14576dd191f3
+ u8 arg = 0;
+
+ arg = psta->mac_id&0x1f;
-+
++
+ arg |= BIT(7);
-+
++
+ //if (shortGIrate==_TRUE)
+ // arg |= BIT(5);
-+
-+ tx_ra_bitmap |= ((raid<<28)&0xf0000000);
++
++ tx_ra_bitmap |= ((raid<<28)&0xf0000000);
+
+ DBG_871X("update_bmc_sta, mask=0x%x, arg=0x%x\n", tx_ra_bitmap, arg);
+
@@ -2896,14 +2892,14 @@ index 000000000000..14576dd191f3
+ //bitmap[28:31]= Rate Adaptive id
+ //arg[0:4] = macid
+ //arg[5] = Short GI
-+ rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg);
-+
++ rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg);
++
+ }
+
+ //set ra_id, init_rate
+ psta->raid = raid;
+ psta->init_rate = init_rate;
-+
++
+ _enter_critical_bh(&psta->lock, &irqL);
+ psta->state = _FW_LINKED;
+ _exit_critical_bh(&psta->lock, &irqL);
@@ -2913,18 +2909,18 @@ index 000000000000..14576dd191f3
+ {
+ DBG_871X("add_RATid_bmc_sta error!\n");
+ }
-+
++
+}
+
+//notes:
-+//AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode
-+//MAC_ID = AID+1 for sta in ap/adhoc mode
++//AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode
++//MAC_ID = AID+1 for sta in ap/adhoc mode
+//MAC_ID = 1 for bc/mc for sta/ap/adhoc
+//MAC_ID = 0 for bssid for sta/ap/adhoc
+//CAM_ID = //0~3 for default key, cmd_id=macid + 3, macid=aid+1;
+
+void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
-+{
++{
+ _irqL irqL;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -2936,19 +2932,19 @@ index 000000000000..14576dd191f3
+ //psta->intf_tag = 0;
+
+ //psta->mac_id = psta->aid+4;
-+ psta->mac_id = psta->aid+1;
-+
++ psta->mac_id = psta->aid+1;
++
+ if(psecuritypriv->dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)
+ psta->ieee8021x_blocked = _TRUE;
+ else
+ psta->ieee8021x_blocked = _FALSE;
-+
++
+
+ //update sta's cap
-+
++
+ //ERP
+ VCS_update(padapter, psta);
-+
++
+ //HT related cap
+ if(phtpriv_sta->ht_option)
+ {
@@ -2967,16 +2963,16 @@ index 000000000000..14576dd191f3
+ //phtpriv_sta->bwmode = HT_CHANNEL_WIDTH_40;
+ phtpriv_sta->bwmode = pmlmeext->cur_bwmode;
+ phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset;
-+
-+ }
++
++ }
+
+ psta->qos_option = _TRUE;
-+
++
+ }
+ else
+ {
+ phtpriv_sta->ampdu_enable = _FALSE;
-+
++
+ phtpriv_sta->sgi = _FALSE;
+ phtpriv_sta->bwmode = HT_CHANNEL_WIDTH_20;
+ phtpriv_sta->ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
@@ -2984,15 +2980,15 @@ index 000000000000..14576dd191f3
+
+ //Rx AMPDU
+ send_delba(padapter, 0, psta->hwaddr);// recipient
-+
++
+ //TX AMPDU
+ send_delba(padapter, 1, psta->hwaddr);// // originator
+ phtpriv_sta->agg_enable_bitmap = 0x0;//reset
+ phtpriv_sta->candidate_tid_bitmap = 0x0;//reset
-+
++
+
+ //todo: init other variables
-+
++
+ _rtw_memset((void*)&psta->sta_stats, 0, sizeof(struct stainfo_stats));
+
+
@@ -3003,7 +2999,7 @@ index 000000000000..14576dd191f3
+ _enter_critical_bh(&psta->lock, &irqL);
+ psta->state |= _FW_LINKED;
+ _exit_critical_bh(&psta->lock, &irqL);
-+
++
+
+}
+
@@ -3014,18 +3010,18 @@ index 000000000000..14576dd191f3
+ struct registry_priv *pregpriv = &padapter->registrypriv;
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
-+
++
+ DBG_871X("%s\n", __FUNCTION__);
-+
++
+
+ //handle A-MPDU parameter field
-+ /*
++ /*
+ AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k
-+ AMPDU_para [4:2]:Min MPDU Start Spacing
++ AMPDU_para [4:2]:Min MPDU Start Spacing
+ */
-+ max_AMPDU_len = pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x03;
-+
-+ min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) >> 2;
++ max_AMPDU_len = pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x03;
++
++ min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) >> 2;
+
+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, (u8 *)(&min_MPDU_spacing));
+
@@ -3058,11 +3054,11 @@ index 000000000000..14576dd191f3
+ u8 *p;
+ u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
+ u16 bcn_interval;
-+ u32 acparm;
-+ int ie_len;
++ u32 acparm;
++ int ie_len;
+ struct registry_priv *pregpriv = &padapter->registrypriv;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+ struct security_priv* psecuritypriv=&(padapter->securitypriv);
++ struct security_priv* psecuritypriv=&(padapter->securitypriv);
+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -3075,13 +3071,13 @@ index 000000000000..14576dd191f3
+ u8 change_band = _FALSE;
+ //DBG_871X("%s\n", __FUNCTION__);
+
-+ bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
++ bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
+ cur_channel = pnetwork->Configuration.DSConfig;
+ cur_bwmode = HT_CHANNEL_WIDTH_20;;
+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
-+
+
-+ //check if there is wps ie,
++
++ //check if there is wps ie,
+ //if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd,
+ //and at first time the security ie ( RSN/WPA IE) will not include in beacon.
+ if(NULL == rtw_get_wps_ie(pnetwork->IEs+_FIXED_IE_LENGTH_, pnetwork->IELength-_FIXED_IE_LENGTH_, NULL, NULL))
@@ -3104,18 +3100,18 @@ index 000000000000..14576dd191f3
+
+ update_hw_ht_param(padapter);
+ }
-+
++
+
+ if(pmlmepriv->cur_network.join_res != _TRUE) //setting only at first time
-+ {
++ {
+ //WEP Key will be set before this function, do not clear CAM.
+ if ((psecuritypriv->dot11PrivacyAlgrthm != _WEP40_) && (psecuritypriv->dot11PrivacyAlgrthm != _WEP104_))
+ flush_all_cam_entry(padapter); //clear CAM
-+ }
++ }
++
++ //set MSR to AP_Mode
++ Set_MSR(padapter, _HW_STATE_AP_);
+
-+ //set MSR to AP_Mode
-+ Set_MSR(padapter, _HW_STATE_AP_);
-+
+ //Set BSSID REG
+ rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pnetwork->MacAddress);
+
@@ -3151,8 +3147,8 @@ index 000000000000..14576dd191f3
+ //disable dynamic functions, such as high power, DIG
+ //Save_DM_Func_Flag(padapter);
+ //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, _FALSE);
-+
-+#ifdef CONFIG_CONCURRENT_MODE
++
++#ifdef CONFIG_CONCURRENT_MODE
+ if(padapter->adapter_type > PRIMARY_ADAPTER)
+ {
+ if(rtw_buddy_adapter_up(padapter))
@@ -3161,22 +3157,22 @@ index 000000000000..14576dd191f3
+
+ //turn on dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_ADAPTER
+ Switch_DM_Func(pbuddy_adapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE);
-+
++
+ rtw_hal_set_hwreg(pbuddy_adapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain));
+ }
+ }
+ else
+#endif
+ {
-+ //turn on dynamic functions
++ //turn on dynamic functions
+ Switch_DM_Func(padapter, DYNAMIC_FUNC_DIG|DYNAMIC_FUNC_HP|DYNAMIC_FUNC_SS, _TRUE);
+
+ rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain));
-+ }
-+
++ }
++
+ }
+
-+ //set channel, bwmode
++ //set channel, bwmode
+ p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs)));
+ if( p && ie_len)
+ {
@@ -3190,7 +3186,7 @@ index 000000000000..14576dd191f3
+ else
+ if( pregpriv->cbw40_enable & BIT(0) )
+ cbw40_enable = 1;
-+
++
+ if ((cbw40_enable) && (pht_info->infos[0] & BIT(2)))
+ {
+ //switch to the 40M Hz mode
@@ -3202,20 +3198,20 @@ index 000000000000..14576dd191f3
+ //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
+ break;
-+
++
+ case 3:
+ //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
-+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
++ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
+ break;
-+
++
+ default:
+ //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
+ break;
-+ }
-+
++ }
++
+ }
-+
++
+ }
+
+#ifdef CONFIG_DUALMAC_CONCURRENT
@@ -3230,31 +3226,31 @@ index 000000000000..14576dd191f3
+ }
+ else if(check_buddy_fwstate(padapter, _FW_LINKED)==_TRUE)//only second adapter can enter AP Mode
+ {
-+ _adapter *pbuddy_adapter = padapter->pbuddy_adapter;
++ _adapter *pbuddy_adapter = padapter->pbuddy_adapter;
+ struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
-+
++
+ //To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter
+ DBG_871X("primary iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n");
+ DBG_871X("primary adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset);
+ DBG_871X("second adapter, CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
-+
++
+ if((cur_channel <= 14 && pbuddy_mlmeext->cur_channel >= 36) ||
+ (cur_channel >= 36 && pbuddy_mlmeext->cur_channel <= 14))
+ change_band = _TRUE;
-+
++
+ cur_channel = pbuddy_mlmeext->cur_channel;
+ if(cur_bwmode == HT_CHANNEL_WIDTH_40)
+ {
+ if(pht_info)
+ pht_info->infos[0] &= ~(BIT(0)|BIT(1));
-+
++
+ if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40)
+ {
+ cur_ch_offset = pbuddy_mlmeext->cur_ch_offset;
+
+ //to update cur_ch_offset value in beacon
+ if(pht_info)
-+ {
++ {
+ switch(cur_ch_offset)
+ {
+ case HAL_PRIME_CHNL_OFFSET_LOWER:
@@ -3263,22 +3259,22 @@ index 000000000000..14576dd191f3
+ case HAL_PRIME_CHNL_OFFSET_UPPER:
+ pht_info->infos[0] |= 0x3;
+ break;
-+ case HAL_PRIME_CHNL_OFFSET_DONT_CARE:
-+ default:
-+ break;
++ case HAL_PRIME_CHNL_OFFSET_DONT_CARE:
++ default:
++ break;
+ }
-+ }
-+
++ }
++
+ }
+ else if(pbuddy_mlmeext->cur_bwmode == HT_CHANNEL_WIDTH_20)
+ {
+ cur_bwmode = HT_CHANNEL_WIDTH_20;
+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
-+
++
+ if(cur_channel>0 && cur_channel<5)
+ {
+ if(pht_info)
-+ pht_info->infos[0] |= 0x1;
++ pht_info->infos[0] |= 0x1;
+
+ cur_bwmode = HT_CHANNEL_WIDTH_40;
+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
@@ -3288,30 +3284,30 @@ index 000000000000..14576dd191f3
+ {
+ if(pht_info)
+ pht_info->infos[0] |= 0x3;
-+
++
+ cur_bwmode = HT_CHANNEL_WIDTH_40;
+ cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
-+ }
++ }
+
+ set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode);
+ }
-+
++
+ }
+
+ // to update channel value in beacon
-+ pnetwork->Configuration.DSConfig = cur_channel;
++ pnetwork->Configuration.DSConfig = cur_channel;
+ p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _DSSET_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs)));
+ if(p && ie_len>0)
+ *(p + 2) = cur_channel;
-+
++
+ if(pht_info)
+ pht_info->primary_channel = cur_channel;
-+
++
+ //set buddy adapter channel, bandwidth, offeset to current adapter
-+ pmlmeext->cur_channel = cur_channel;
++ pmlmeext->cur_channel = cur_channel;
+ pmlmeext->cur_bwmode = cur_bwmode;
+ pmlmeext->cur_ch_offset = cur_ch_offset;
-+
++
+ //buddy interface band is different from current interface, update ERP, support rate, ext support rate IE
+ if(change_band == _TRUE)
+ change_band_update_ie(padapter, pnetwork);
@@ -3323,7 +3319,7 @@ index 000000000000..14576dd191f3
+ DBG_871X("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
+
+ //
-+ pmlmeext->cur_channel = cur_channel;
++ pmlmeext->cur_channel = cur_channel;
+ pmlmeext->cur_bwmode = cur_bwmode;
+ pmlmeext->cur_ch_offset = cur_ch_offset;
+#endif //CONFIG_DUALMAC_CONCURRENT
@@ -3338,12 +3334,12 @@ index 000000000000..14576dd191f3
+
+ //udpate capability after cur_wireless_mode updated
+ update_capinfo(padapter, rtw_get_capability((WLAN_BSSID_EX *)pnetwork));
-+
++
+ //let pnetwork_mlmeext == pnetwork_mlme.
+ _rtw_memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
+
+#ifdef CONFIG_P2P
-+ _rtw_memcpy(pwdinfo->p2p_group_ssid, pnetwork->Ssid.Ssid, pnetwork->Ssid.SsidLength);
++ _rtw_memcpy(pwdinfo->p2p_group_ssid, pnetwork->Ssid.Ssid, pnetwork->Ssid.SsidLength);
+ pwdinfo->p2p_group_ssid_len = pnetwork->Ssid.SsidLength;
+#endif //CONFIG_P2P
+
@@ -3358,7 +3354,7 @@ index 000000000000..14576dd191f3
+ {
+ DBG_871X("issue_beacon, fail!\n");
+ }
-+#endif
++#endif
+#endif //!CONFIG_INTERRUPT_BASED_TXBCN
+
+ }
@@ -3366,9 +3362,9 @@ index 000000000000..14576dd191f3
+
+ //update bc/mc sta_info
+ update_bmc_sta(padapter);
-+
++
+ //pmlmeext->bstart_bss = _TRUE;
-+
++
+}
+
+int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
@@ -3380,19 +3376,19 @@ index 000000000000..14576dd191f3
+ struct sta_info *psta = NULL;
+ u16 cap, ht_cap=_FALSE;
+ uint ie_len = 0;
-+ int group_cipher, pairwise_cipher;
++ int group_cipher, pairwise_cipher;
+ u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX];
+ int supportRateNum = 0;
+ u8 OUI1[] = {0x00, 0x50, 0xf2,0x01};
+ u8 wps_oui[4]={0x0,0x50,0xf2,0x04};
-+ u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
-+ struct registry_priv *pregistrypriv = &padapter->registrypriv;
++ u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
++ struct registry_priv *pregistrypriv = &padapter->registrypriv;
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+ WLAN_BSSID_EX *pbss_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
++ WLAN_BSSID_EX *pbss_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ u8 *ie = pbss_network->IEs;
-+
++
+
+ /* SSID */
+ /* Supported rates */
@@ -3413,11 +3409,11 @@ index 000000000000..14576dd191f3
+
+ if(len>MAX_IE_SZ)
+ return _FAIL;
-+
++
+ pbss_network->IELength = len;
+
+ _rtw_memset(ie, 0, MAX_IE_SZ);
-+
++
+ _rtw_memcpy(ie, pbuf, pbss_network->IELength);
+
+
@@ -3427,12 +3423,12 @@ index 000000000000..14576dd191f3
+ pbss_network->Rssi = 0;
+
+ _rtw_memcpy(pbss_network->MacAddress, myid(&(padapter->eeprompriv)), ETH_ALEN);
-+
++
+ //beacon interval
+ p = rtw_get_beacon_interval_from_ie(ie);//ie + 8; // 8: TimeStamp, 2: Beacon Interval 2:Capability
+ //pbss_network->Configuration.BeaconPeriod = le16_to_cpu(*(unsigned short*)p);
+ pbss_network->Configuration.BeaconPeriod = RTW_GET_LE16(p);
-+
++
+ //capability
+ //cap = *(unsigned short *)rtw_get_capability_from_ie(ie);
+ //cap = le16_to_cpu(cap);
@@ -3445,7 +3441,7 @@ index 000000000000..14576dd191f3
+ _rtw_memset(&pbss_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
+ _rtw_memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
+ pbss_network->Ssid.SsidLength = ie_len;
-+ }
++ }
+
+ //chnnel
+ channel = 0;
@@ -3456,23 +3452,23 @@ index 000000000000..14576dd191f3
+
+ pbss_network->Configuration.DSConfig = channel;
+
-+
++
+ _rtw_memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX);
+ // get supported rates
-+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
-+ if (p != NULL)
++ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
++ if (p != NULL)
+ {
-+ _rtw_memcpy(supportRate, p+2, ie_len);
++ _rtw_memcpy(supportRate, p+2, ie_len);
+ supportRateNum = ie_len;
+ }
-+
++
+ //get ext_supported rates
-+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->IELength - _BEACON_IE_OFFSET_);
++ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->IELength - _BEACON_IE_OFFSET_);
+ if (p != NULL)
+ {
+ _rtw_memcpy(supportRate+supportRateNum, p+2, ie_len);
+ supportRateNum += ie_len;
-+
++
+ }
+
+ network_type = rtw_check_network_type(supportRate, supportRateNum, channel);
@@ -3498,14 +3494,14 @@ index 000000000000..14576dd191f3
+ //wpa2
+ group_cipher = 0; pairwise_cipher = 0;
+ psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_;
-+ psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_;
-+ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
++ psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_;
++ p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
+ if(p && ie_len>0)
+ {
+ if(rtw_parse_wpa2_ie(p, ie_len+2, &group_cipher, &pairwise_cipher) == _SUCCESS)
+ {
+ psecuritypriv->dot11AuthAlgrthm= dot11AuthAlgrthm_8021X;
-+
++
+ psecuritypriv->dot8021xalg = 1;//psk, todo:802.1x
+ psecuritypriv->wpa_psk |= BIT(1);
+
@@ -3514,60 +3510,60 @@ index 000000000000..14576dd191f3
+#if 0
+ switch(group_cipher)
+ {
-+ case WPA_CIPHER_NONE:
++ case WPA_CIPHER_NONE:
+ psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_;
+ break;
-+ case WPA_CIPHER_WEP40:
++ case WPA_CIPHER_WEP40:
+ psecuritypriv->wpa2_group_cipher = _WEP40_;
+ break;
-+ case WPA_CIPHER_TKIP:
++ case WPA_CIPHER_TKIP:
+ psecuritypriv->wpa2_group_cipher = _TKIP_;
+ break;
-+ case WPA_CIPHER_CCMP:
-+ psecuritypriv->wpa2_group_cipher = _AES_;
++ case WPA_CIPHER_CCMP:
++ psecuritypriv->wpa2_group_cipher = _AES_;
+ break;
-+ case WPA_CIPHER_WEP104:
++ case WPA_CIPHER_WEP104:
+ psecuritypriv->wpa2_group_cipher = _WEP104_;
+ break;
+ }
+
+ switch(pairwise_cipher)
+ {
-+ case WPA_CIPHER_NONE:
++ case WPA_CIPHER_NONE:
+ psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_;
+ break;
-+ case WPA_CIPHER_WEP40:
++ case WPA_CIPHER_WEP40:
+ psecuritypriv->wpa2_pairwise_cipher = _WEP40_;
+ break;
-+ case WPA_CIPHER_TKIP:
++ case WPA_CIPHER_TKIP:
+ psecuritypriv->wpa2_pairwise_cipher = _TKIP_;
+ break;
-+ case WPA_CIPHER_CCMP:
++ case WPA_CIPHER_CCMP:
+ psecuritypriv->wpa2_pairwise_cipher = _AES_;
+ break;
-+ case WPA_CIPHER_WEP104:
++ case WPA_CIPHER_WEP104:
+ psecuritypriv->wpa2_pairwise_cipher = _WEP104_;
+ break;
+ }
-+#endif
++#endif
+ }
-+
++
+ }
+
+ //wpa
+ ie_len = 0;
+ group_cipher = 0; pairwise_cipher = 0;
+ psecuritypriv->wpa_group_cipher = _NO_PRIVACY_;
-+ psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;
++ psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;
+ for (p = ie + _BEACON_IE_OFFSET_; ;p += (ie_len + 2))
+ {
-+ p = rtw_get_ie(p, _SSN_IE_1_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));
++ p = rtw_get_ie(p, _SSN_IE_1_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));
+ if ((p) && (_rtw_memcmp(p+2, OUI1, 4)))
+ {
+ if(rtw_parse_wpa_ie(p, ie_len+2, &group_cipher, &pairwise_cipher) == _SUCCESS)
+ {
+ psecuritypriv->dot11AuthAlgrthm= dot11AuthAlgrthm_8021X;
-+
++
+ psecuritypriv->dot8021xalg = 1;//psk, todo:802.1x
+
+ psecuritypriv->wpa_psk |= BIT(0);
@@ -3578,53 +3574,53 @@ index 000000000000..14576dd191f3
+#if 0
+ switch(group_cipher)
+ {
-+ case WPA_CIPHER_NONE:
++ case WPA_CIPHER_NONE:
+ psecuritypriv->wpa_group_cipher = _NO_PRIVACY_;
+ break;
-+ case WPA_CIPHER_WEP40:
++ case WPA_CIPHER_WEP40:
+ psecuritypriv->wpa_group_cipher = _WEP40_;
+ break;
-+ case WPA_CIPHER_TKIP:
++ case WPA_CIPHER_TKIP:
+ psecuritypriv->wpa_group_cipher = _TKIP_;
+ break;
-+ case WPA_CIPHER_CCMP:
-+ psecuritypriv->wpa_group_cipher = _AES_;
++ case WPA_CIPHER_CCMP:
++ psecuritypriv->wpa_group_cipher = _AES_;
+ break;
-+ case WPA_CIPHER_WEP104:
++ case WPA_CIPHER_WEP104:
+ psecuritypriv->wpa_group_cipher = _WEP104_;
+ break;
+ }
+
+ switch(pairwise_cipher)
+ {
-+ case WPA_CIPHER_NONE:
++ case WPA_CIPHER_NONE:
+ psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;
+ break;
-+ case WPA_CIPHER_WEP40:
++ case WPA_CIPHER_WEP40:
+ psecuritypriv->wpa_pairwise_cipher = _WEP40_;
+ break;
-+ case WPA_CIPHER_TKIP:
++ case WPA_CIPHER_TKIP:
+ psecuritypriv->wpa_pairwise_cipher = _TKIP_;
+ break;
-+ case WPA_CIPHER_CCMP:
++ case WPA_CIPHER_CCMP:
+ psecuritypriv->wpa_pairwise_cipher = _AES_;
+ break;
-+ case WPA_CIPHER_WEP104:
++ case WPA_CIPHER_WEP104:
+ psecuritypriv->wpa_pairwise_cipher = _WEP104_;
+ break;
+ }
-+#endif
++#endif
+ }
+
+ break;
-+
++
+ }
-+
++
+ if ((p == NULL) || (ie_len == 0))
+ {
+ break;
+ }
-+
++
+ }
+
+ //wmm
@@ -3633,28 +3629,28 @@ index 000000000000..14576dd191f3
+ if(pregistrypriv->wmm_enable)
+ {
+ for (p = ie + _BEACON_IE_OFFSET_; ;p += (ie_len + 2))
-+ {
-+ p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));
-+ if((p) && _rtw_memcmp(p+2, WMM_PARA_IE, 6))
++ {
++ p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));
++ if((p) && _rtw_memcmp(p+2, WMM_PARA_IE, 6))
+ {
-+ pmlmepriv->qospriv.qos_option = 1;
++ pmlmepriv->qospriv.qos_option = 1;
+
+ *(p+8) |= BIT(7);//QoS Info, support U-APSD
-+
++
+ /* disable all ACM bits since the WMM admission control is not supported */
+ *(p + 10) &= ~BIT(4); /* BE */
+ *(p + 14) &= ~BIT(4); /* BK */
+ *(p + 18) &= ~BIT(4); /* VI */
+ *(p + 22) &= ~BIT(4); /* VO */
-+
-+ break;
++
++ break;
+ }
-+
++
+ if ((p == NULL) || (ie_len == 0))
+ {
+ break;
-+ }
-+ }
++ }
++ }
+ }
+
+ //parsing HT_CAP_IE
@@ -3666,34 +3662,34 @@ index 000000000000..14576dd191f3
+ struct rtw_ieee80211_ht_cap *pht_cap = (struct rtw_ieee80211_ht_cap *)(p+2);
+
+ pHT_caps_ie=p;
-+
-+
++
++
+ ht_cap = _TRUE;
+ network_type |= WIRELESS_11_24N;
+
-+
++
+ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
+
+ if((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) ||
+ (psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_CCMP))
+ {
+ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&(0x07<<2));
-+ }
++ }
+ else
+ {
-+ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
-+ }
++ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
++ }
+
+ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR & 0x03); //set Max Rx AMPDU size to 64K
+
+ if(rf_type == RF_1T1R)
-+ {
++ {
+ pht_cap->supp_mcs_set[0] = 0xff;
-+ pht_cap->supp_mcs_set[1] = 0x0;
++ pht_cap->supp_mcs_set[1] = 0x0;
+ }
+
-+ _rtw_memcpy(&pmlmepriv->htpriv.ht_cap, p+2, ie_len);
-+
++ _rtw_memcpy(&pmlmepriv->htpriv.ht_cap, p+2, ie_len);
++
+ }
+
+ //parsing HT_INFO_IE
@@ -3707,7 +3703,7 @@ index 000000000000..14576dd191f3
+ {
+ case WIRELESS_11B:
+ pbss_network->NetworkTypeInUse = Ndis802_11DS;
-+ break;
++ break;
+ case WIRELESS_11G:
+ case WIRELESS_11BG:
+ case WIRELESS_11G_24N:
@@ -3721,7 +3717,7 @@ index 000000000000..14576dd191f3
+ pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
+ break;
+ }
-+
++
+ pmlmepriv->cur_network.network_type = network_type;
+
+
@@ -3729,14 +3725,14 @@ index 000000000000..14576dd191f3
+#ifdef CONFIG_80211N_HT
+ if( (psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
+ (psecuritypriv->wpa_pairwise_cipher&WPA_CIPHER_TKIP))
-+ {
++ {
+ //todo:
+ //ht_cap = _FALSE;
+ }
-+
-+ //ht_cap
++
++ //ht_cap
+ if(pregistrypriv->ht_enable && ht_cap==_TRUE)
-+ {
++ {
+ pmlmepriv->htpriv.ht_option = _TRUE;
+ pmlmepriv->qospriv.qos_option = 1;
+
@@ -3746,7 +3742,7 @@ index 000000000000..14576dd191f3
+ }
+
+ HT_caps_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_caps_ie);
-+
++
+ HT_info_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_info_ie);
+ }
+#endif
@@ -3756,23 +3752,23 @@ index 000000000000..14576dd191f3
+
+ //issue beacon to start bss network
+ start_bss_network(padapter, (u8*)pbss_network);
-+
++
+
+ //alloc sta_info for ap itself
+ psta = rtw_get_stainfo(&padapter->stapriv, pbss_network->MacAddress);
+ if(!psta)
+ {
+ psta = rtw_alloc_stainfo(&padapter->stapriv, pbss_network->MacAddress);
-+ if (psta == NULL)
-+ {
++ if (psta == NULL)
++ {
+ return _FAIL;
-+ }
-+ }
-+ psta->state |= WIFI_AP_STATE; //Aries, add,fix bug of flush_cam_entry at STOP AP mode , 0724
++ }
++ }
++ psta->state |= WIFI_AP_STATE; //Aries, add,fix bug of flush_cam_entry at STOP AP mode , 0724
+ rtw_indicate_connect( padapter);
+
+ pmlmepriv->cur_network.join_res = _TRUE;//for check if already set beacon
-+
++
+ //update bc/mc sta_info
+ //update_bmc_sta(padapter);
+
@@ -3799,19 +3795,19 @@ index 000000000000..14576dd191f3
+ struct rtw_wlan_acl_node *paclnode;
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-+ _queue *pacl_node_q =&pacl_list->acl_node_q;
++ _queue *pacl_node_q =&pacl_list->acl_node_q;
+
-+ DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
++ DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
+
+ if((NUM_ACL-1) < pacl_list->num)
-+ return (-1);
++ return (-1);
+
+
+ _enter_critical_bh(&(pacl_node_q->lock), &irqL);
+
+ phead = get_list_head(pacl_node_q);
+ plist = get_next(phead);
-+
++
+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
+ {
+ paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
@@ -3825,15 +3821,15 @@ index 000000000000..14576dd191f3
+ DBG_871X("%s, sta has been added\n", __func__);
+ break;
+ }
-+ }
++ }
+ }
-+
++
+ _exit_critical_bh(&(pacl_node_q->lock), &irqL);
+
+
+ if(added == _TRUE)
+ return ret;
-+
++
+
+ _enter_critical_bh(&(pacl_node_q->lock), &irqL);
+
@@ -3844,13 +3840,13 @@ index 000000000000..14576dd191f3
+ if(paclnode->valid == _FALSE)
+ {
+ _rtw_init_listhead(&paclnode->list);
-+
++
+ _rtw_memcpy(paclnode->addr, addr, ETH_ALEN);
-+
++
+ paclnode->valid = _TRUE;
+
+ rtw_list_insert_tail(&paclnode->list, get_list_head(pacl_node_q));
-+
++
+ pacl_list->num++;
+
+ break;
@@ -3858,7 +3854,7 @@ index 000000000000..14576dd191f3
+ }
+
+ DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num);
-+
++
+ _exit_critical_bh(&(pacl_node_q->lock), &irqL);
+
+ return ret;
@@ -3872,15 +3868,15 @@ index 000000000000..14576dd191f3
+ struct rtw_wlan_acl_node *paclnode;
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-+ _queue *pacl_node_q =&pacl_list->acl_node_q;
++ _queue *pacl_node_q =&pacl_list->acl_node_q;
+
-+ DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
++ DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
+
+ _enter_critical_bh(&(pacl_node_q->lock), &irqL);
+
+ phead = get_list_head(pacl_node_q);
+ plist = get_next(phead);
-+
++
+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
+ {
+ paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
@@ -3893,16 +3889,16 @@ index 000000000000..14576dd191f3
+ paclnode->valid = _FALSE;
+
+ rtw_list_delete(&paclnode->list);
-+
++
+ pacl_list->num--;
+ }
-+ }
++ }
+ }
-+
++
+ _exit_critical_bh(&(pacl_node_q->lock), &irqL);
+
+ DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num);
-+
++
+ return ret;
+
+}
@@ -3944,10 +3940,10 @@ index 000000000000..14576dd191f3
+ pIE->data[0] |= RTW_ERP_INFO_BARKER_PREAMBLE_MODE;
+ else
+ pIE->data[0] &= ~(RTW_ERP_INFO_BARKER_PREAMBLE_MODE);
-+
++
+ ERP_IE_handler(padapter, pIE);
+ }
-+
++
+}
+
+static void update_bcn_htcap_ie(_adapter *padapter)
@@ -3957,7 +3953,7 @@ index 000000000000..14576dd191f3
+}
+
+static void update_bcn_htinfo_ie(_adapter *padapter)
-+{
++{
+ DBG_871X("%s\n", __FUNCTION__);
+
+}
@@ -3977,7 +3973,7 @@ index 000000000000..14576dd191f3
+static void update_bcn_wmm_ie(_adapter *padapter)
+{
+ DBG_871X("%s\n", __FUNCTION__);
-+
++
+}
+
+static void update_bcn_wps_ie(_adapter *padapter)
@@ -3995,7 +3991,7 @@ index 000000000000..14576dd191f3
+ DBG_871X("%s\n", __FUNCTION__);
+
+ pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
-+
++
+ if(pwps_ie==NULL || wps_ielen==0)
+ return;
+
@@ -4012,7 +4008,7 @@ index 000000000000..14576dd191f3
+ _rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
+ }
+
-+
++
+ pwps_ie_src = pmlmepriv->wps_beacon_ie;
+ if(pwps_ie_src == NULL)
+ return;
@@ -4064,9 +4060,9 @@ index 000000000000..14576dd191f3
+ else
+ {
+ DBG_871X("unknown OUI type!\n");
-+ }
-+
-+
++ }
++
++
+}
+
+void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
@@ -4075,7 +4071,7 @@ index 000000000000..14576dd191f3
+ struct mlme_priv *pmlmepriv;
+ struct mlme_ext_priv *pmlmeext;
+ //struct mlme_ext_info *pmlmeinfo;
-+
++
+ //DBG_871X("%s\n", __FUNCTION__);
+
+ if(!padapter)
@@ -4095,13 +4091,13 @@ index 000000000000..14576dd191f3
+ case 0xFF:
+
+ update_bcn_fixed_ie(padapter);//8: TimeStamp, 2: Beacon Interval 2:Capability
-+
++
+ break;
+
+ case _TIM_IE_:
-+
++
+ update_BCNTIM(padapter);
-+
++
+ break;
+
+ case _ERPINFO_IE_:
@@ -4113,7 +4109,7 @@ index 000000000000..14576dd191f3
+ case _HT_CAPABILITY_IE_:
+
+ update_bcn_htcap_ie(padapter);
-+
++
+ break;
+
+ case _RSN_IE_2_:
@@ -4121,28 +4117,28 @@ index 000000000000..14576dd191f3
+ update_bcn_rsn_ie(padapter);
+
+ break;
-+
++
+ case _HT_ADD_INFO_IE_:
+
+ update_bcn_htinfo_ie(padapter);
-+
++
+ break;
-+
++
+ case _VENDOR_SPECIFIC_IE_:
+
+ update_bcn_vendor_spec_ie(padapter, oui);
-+
++
+ break;
-+
++
+ default:
+ break;
+ }
+
+ pmlmepriv->update_bcn = _TRUE;
-+
-+ _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL);
-+
-+#ifndef CONFIG_INTERRUPT_BASED_TXBCN
++
++ _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL);
++
++#ifndef CONFIG_INTERRUPT_BASED_TXBCN
+#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
+ if(tx)
+ {
@@ -4150,12 +4146,12 @@ index 000000000000..14576dd191f3
+ set_tx_beacon_cmd(padapter);
+ }
+#else
-+ {
-+ //PCI will issue beacon when BCN interrupt occurs.
++ {
++ //PCI will issue beacon when BCN interrupt occurs.
+ }
+#endif
+#endif //!CONFIG_INTERRUPT_BASED_TXBCN
-+
++
+}
+
+#ifdef CONFIG_80211N_HT
@@ -4179,9 +4175,9 @@ index 000000000000..14576dd191f3
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+ struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
+
-+ if(pmlmepriv->htpriv.ht_option == _TRUE)
++ if(pmlmepriv->htpriv.ht_option == _TRUE)
+ return 0;
-+
++
+ //if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed)
+ // return 0;
+
@@ -4240,7 +4236,7 @@ index 000000000000..14576dd191f3
+ __FUNCTION__, pmlmepriv->ht_op_mode, op_mode_changes);
+
+ return op_mode_changes;
-+
++
+}
+
+#endif /* CONFIG_80211N_HT */
@@ -4252,27 +4248,27 @@ index 000000000000..14576dd191f3
+ {
+ _irqL irqL;
+ _list *phead, *plist;
-+ struct sta_info *psta=NULL;
++ struct sta_info *psta=NULL;
+ struct sta_priv *pstapriv = &padapter->stapriv;
-+
++
+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
-+
++++
+ phead = &pstapriv->asoc_list;
+ plist = get_next(phead);
-+
++++
+ //check asoc_queue
-+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
++ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
+ {
+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
-+
++++
+ plist = get_next(plist);
+ +
-+ VCS_update(padapter, psta);
++ VCS_update(padapter, psta);
+ }
+
+ _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
+
-+ }
++ }
+
+} +}
+ +
@@ -4283,34 +4279,34 @@ index 000000000000..14576dd191f3
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+
-+
++
+#if 0
+ if (!(psta->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) &&
+ !psta->no_short_preamble_set) {
+ psta->no_short_preamble_set = 1;
+ pmlmepriv->num_sta_no_short_preamble++;
-+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
++ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
+ (pmlmepriv->num_sta_no_short_preamble == 1))
+ ieee802_11_set_beacons(hapd->iface);
+ }
+#endif
+
+
-+ if(!(psta->flags & WLAN_STA_SHORT_PREAMBLE))
++ if(!(psta->flags & WLAN_STA_SHORT_PREAMBLE))
+ {
+ if(!psta->no_short_preamble_set)
+ {
+ psta->no_short_preamble_set = 1;
-+
++
+ pmlmepriv->num_sta_no_short_preamble++;
-+
-+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
-+ (pmlmepriv->num_sta_no_short_preamble == 1))
++
++ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
++ (pmlmepriv->num_sta_no_short_preamble == 1))
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, 0xFF, NULL, _TRUE);
-+ }
-+
++ }
++
+ }
+ }
+ else
@@ -4318,16 +4314,16 @@ index 000000000000..14576dd191f3
+ if(psta->no_short_preamble_set)
+ {
+ psta->no_short_preamble_set = 0;
-+
++
+ pmlmepriv->num_sta_no_short_preamble--;
-+
-+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
-+ (pmlmepriv->num_sta_no_short_preamble == 0))
++
++ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
++ (pmlmepriv->num_sta_no_short_preamble == 0))
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, 0xFF, NULL, _TRUE);
-+ }
-+
++ }
++
+ }
+ }
+
@@ -4345,32 +4341,32 @@ index 000000000000..14576dd191f3
+ if(!psta->nonerp_set)
+ {
+ psta->nonerp_set = 1;
-+
++
+ pmlmepriv->num_sta_non_erp++;
-+
++
+ if (pmlmepriv->num_sta_non_erp == 1)
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE);
-+ }
++ }
+ }
-+
++
+ }
+ else
+ {
+ if(psta->nonerp_set)
+ {
+ psta->nonerp_set = 0;
-+
++
+ pmlmepriv->num_sta_non_erp--;
-+
++
+ if (pmlmepriv->num_sta_non_erp == 0)
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE);
-+ }
++ }
+ }
-+
++
+ }
+
+
@@ -4390,16 +4386,16 @@ index 000000000000..14576dd191f3
+ if(!psta->no_short_slot_time_set)
+ {
+ psta->no_short_slot_time_set = 1;
-+
++
+ pmlmepriv->num_sta_no_short_slot_time++;
-+
++
+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
-+ (pmlmepriv->num_sta_no_short_slot_time == 1))
++ (pmlmepriv->num_sta_no_short_slot_time == 1))
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, 0xFF, NULL, _TRUE);
-+ }
-+
++ }
++
+ }
+ }
+ else
@@ -4407,24 +4403,24 @@ index 000000000000..14576dd191f3
+ if(psta->no_short_slot_time_set)
+ {
+ psta->no_short_slot_time_set = 0;
-+
++
+ pmlmepriv->num_sta_no_short_slot_time--;
-+
++
+ if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
-+ (pmlmepriv->num_sta_no_short_slot_time == 0))
++ (pmlmepriv->num_sta_no_short_slot_time == 0))
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, 0xFF, NULL, _TRUE);
-+ }
++ }
+ }
+ }
-+
++
+#ifdef CONFIG_80211N_HT
+
-+ if (psta->flags & WLAN_STA_HT)
++ if (psta->flags & WLAN_STA_HT)
+ {
+ u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info);
-+
++
+ DBG_871X("HT: STA " MAC_FMT " HT Capabilities "
+ "Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab);
+
@@ -4432,7 +4428,7 @@ index 000000000000..14576dd191f3
+ psta->no_ht_set = 0;
+ pmlmepriv->num_sta_no_ht--;
+ }
-+
++
+ if ((ht_capab & IEEE80211_HT_CAP_GRN_FLD) == 0) {
+ if (!psta->no_ht_gf_set) {
+ psta->no_ht_gf_set = 1;
@@ -4443,7 +4439,7 @@ index 000000000000..14576dd191f3
+ __FUNCTION__, MAC_ARG(psta->hwaddr),
+ pmlmepriv->num_sta_ht_no_gf);
+ }
-+
++
+ if ((ht_capab & IEEE80211_HT_CAP_SUP_WIDTH) == 0) {
+ if (!psta->ht_20mhz_set) {
+ psta->ht_20mhz_set = 1;
@@ -4454,15 +4450,15 @@ index 000000000000..14576dd191f3
+ __FUNCTION__, MAC_ARG(psta->hwaddr),
+ pmlmepriv->num_sta_ht_20mhz);
+ }
-+
-+ }
-+ else
++
++ }
++ else
+ {
+ if (!psta->no_ht_set) {
+ psta->no_ht_set = 1;
+ pmlmepriv->num_sta_no_ht++;
+ }
-+ if(pmlmepriv->htpriv.ht_option == _TRUE) {
++ if(pmlmepriv->htpriv.ht_option == _TRUE) {
+ DBG_871X("%s STA " MAC_FMT
+ " - no HT, num of non-HT stations %d\n",
+ __FUNCTION__, MAC_ARG(psta->hwaddr),
@@ -4474,8 +4470,8 @@ index 000000000000..14576dd191f3
+ {
+ update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE);
+ update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE);
-+ }
-+
++ }
++
+#endif /* CONFIG_80211N_HT */
+
+ //update associcated stations cap.
@@ -4502,17 +4498,17 @@ index 000000000000..14576dd191f3
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, 0xFF, NULL, _TRUE);
-+ }
-+ }
++ }
++ }
+
+ if (psta->nonerp_set) {
-+ psta->nonerp_set = 0;
++ psta->nonerp_set = 0;
+ pmlmepriv->num_sta_non_erp--;
+ if (pmlmepriv->num_sta_non_erp == 0)
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, _ERPINFO_IE_, NULL, _TRUE);
-+ }
++ }
+ }
+
+ if (psta->no_short_slot_time_set) {
@@ -4523,9 +4519,9 @@ index 000000000000..14576dd191f3
+ {
+ beacon_updated = _TRUE;
+ update_beacon(padapter, 0xFF, NULL, _TRUE);
-+ }
++ }
+ }
-+
++
+#ifdef CONFIG_80211N_HT
+
+ if (psta->no_ht_gf_set) {
@@ -4548,7 +4544,7 @@ index 000000000000..14576dd191f3
+ update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE);
+ update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE);
+ }
-+
++
+#endif /* CONFIG_80211N_HT */
+
+ //update associcated stations cap.
@@ -4576,10 +4572,10 @@ index 000000000000..14576dd191f3
+#ifdef CONFIG_80211N_HT
+ //tear down Rx AMPDU
+ send_delba(padapter, 0, psta->hwaddr);// recipient
-+
++
+ //tear down TX AMPDU
+ send_delba(padapter, 1, psta->hwaddr);// // originator
-+
++
+#endif //CONFIG_80211N_HT
+
+ issue_deauth(padapter, psta->hwaddr, reason);
@@ -4619,10 +4615,10 @@ index 000000000000..14576dd191f3
+
+ beacon_updated = bss_cap_update_on_sta_leave(padapter, psta);
+
-+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
++ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
+ rtw_free_stainfo(padapter, psta);
+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
-+
++
+
+ return beacon_updated;
+
@@ -4632,8 +4628,8 @@ index 000000000000..14576dd191f3
+{
+ _irqL irqL;
+ _list *phead, *plist;
-+ int ret=0;
-+ struct sta_info *psta = NULL;
++ int ret=0;
++ struct sta_info *psta = NULL;
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -4648,10 +4644,10 @@ index 000000000000..14576dd191f3
+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
+ phead = &pstapriv->asoc_list;
+ plist = get_next(phead);
-+
++
+ /* for each sta in asoc_queue */
-+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
-+ {
++ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
++ {
+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
+ plist = get_next(plist);
+
@@ -4669,8 +4665,8 @@ index 000000000000..14576dd191f3
+{
+ _irqL irqL;
+ _list *phead, *plist;
-+ int ret=0;
-+ struct sta_info *psta = NULL;
++ int ret=0;
++ struct sta_info *psta = NULL;
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -4690,7 +4686,7 @@ index 000000000000..14576dd191f3
+
+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) {
+ int stainfo_offset;
-+
++
+ psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
+ plist = get_next(plist);
+
@@ -4723,40 +4719,40 @@ index 000000000000..14576dd191f3
+
+/* called > TSR LEVEL for USB or SDIO Interface*/
+void sta_info_update(_adapter *padapter, struct sta_info *psta)
-+{
++{
+ int flags = psta->flags;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+
-+
++
++
+ //update wmm cap.
+ if(WLAN_STA_WME&flags)
+ psta->qos_option = 1;
+ else
+ psta->qos_option = 0;
+
-+ if(pmlmepriv->qospriv.qos_option == 0)
++ if(pmlmepriv->qospriv.qos_option == 0)
+ psta->qos_option = 0;
+
-+
-+#ifdef CONFIG_80211N_HT
++
++#ifdef CONFIG_80211N_HT
+ //update 802.11n ht cap.
+ if(WLAN_STA_HT&flags)
+ {
+ psta->htpriv.ht_option = _TRUE;
-+ psta->qos_option = 1;
++ psta->qos_option = 1;
+ }
-+ else
++ else
+ {
+ psta->htpriv.ht_option = _FALSE;
+ }
-+
-+ if(pmlmepriv->htpriv.ht_option == _FALSE)
++
++ if(pmlmepriv->htpriv.ht_option == _FALSE)
+ psta->htpriv.ht_option = _FALSE;
-+#endif
++#endif
+
+
+ update_sta_info_apmode(padapter, psta);
-+
++
+
+}
+
@@ -4764,10 +4760,10 @@ index 000000000000..14576dd191f3
+void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta)
+{
+ if(psta->state & _FW_LINKED)
-+ {
++ {
+ //add ratid
+ add_RATid(padapter, psta);
-+ }
++ }
+}
+
+/* restore hw setting from sw data structures */
@@ -4805,7 +4801,7 @@ index 000000000000..14576dd191f3
+ }
+
+ _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
-+
++
+ phead = &pstapriv->asoc_list;
+ plist = get_next(phead);
+
@@ -4844,9 +4840,9 @@ index 000000000000..14576dd191f3
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-+
++
+ pmlmepriv->update_bcn = _FALSE;
-+
++
+ //init_mlme_ap_info(padapter);
+ pmlmeext->bstart_bss = _FALSE;
+
@@ -4859,13 +4855,13 @@ index 000000000000..14576dd191f3
+ pmlmepriv->num_sta_ht_no_gf = 0;
+
+ pmlmepriv->num_sta_no_ht = 0;
-+
++
+ pmlmepriv->num_sta_ht_20mhz = 0;
+
+ pmlmepriv->olbc = _FALSE;
+
+ pmlmepriv->olbc_ht = _FALSE;
-+
++
+#ifdef CONFIG_80211N_HT
+ pmlmepriv->ht_op_mode = 0;
+#endif
@@ -4873,20 +4869,20 @@ index 000000000000..14576dd191f3
+ for(i=0; i<NUM_STA; i++)
+ pstapriv->sta_aid[i] = NULL;
+
-+ pmlmepriv->wps_beacon_ie = NULL;
++ pmlmepriv->wps_beacon_ie = NULL;
+ pmlmepriv->wps_probe_resp_ie = NULL;
+ pmlmepriv->wps_assoc_resp_ie = NULL;
-+
++
+ pmlmepriv->p2p_beacon_ie = NULL;
+ pmlmepriv->p2p_probe_resp_ie = NULL;
+
-+
-+ //for ACL
++
++ //for ACL
+ _rtw_init_listhead(&(pacl_list->acl_node_q.queue));
+ pacl_list->num = 0;
+ pacl_list->mode = 0;
+ for(i = 0; i < NUM_ACL; i++)
-+ {
++ {
+ _rtw_init_listhead(&pacl_list->aclnode[i].list);
+ pacl_list->aclnode[i].valid = _FALSE;
+ }
@@ -4901,14 +4897,14 @@ index 000000000000..14576dd191f3
+ struct sta_info *psta=NULL;
+ struct sta_priv *pstapriv = &padapter->stapriv;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
++ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-+ _queue *pacl_node_q =&pacl_list->acl_node_q;
++ _queue *pacl_node_q =&pacl_list->acl_node_q;
+
+ pmlmepriv->update_bcn = _FALSE;
+ pmlmeext->bstart_bss = _FALSE;
+ //_rtw_spinlock_free(&pmlmepriv->bcn_update_lock);
-+
++
+ //reset and init security priv , this can refine with rtw_reset_securitypriv
+ _rtw_memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv));
+ padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
@@ -4917,7 +4913,7 @@ index 000000000000..14576dd191f3
+ //for ACL
+ _enter_critical_bh(&(pacl_node_q->lock), &irqL);
+ phead = get_list_head(pacl_node_q);
-+ plist = get_next(phead);
++ plist = get_next(phead);
+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
+ {
+ paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
@@ -4928,25 +4924,25 @@ index 000000000000..14576dd191f3
+ paclnode->valid = _FALSE;
+
+ rtw_list_delete(&paclnode->list);
-+
-+ pacl_list->num--;
-+ }
-+ }
++
++ pacl_list->num--;
++ }
++ }
+ _exit_critical_bh(&(pacl_node_q->lock), &irqL);
-+
++
+ DBG_871X("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num);
-+
++
+ rtw_sta_flush(padapter);
+
-+ //free_assoc_sta_resources
++ //free_assoc_sta_resources
+ rtw_free_all_stainfo(padapter);
-+
++
+ psta = rtw_get_bcmc_stainfo(padapter);
-+ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
++ _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
+ rtw_free_stainfo(padapter, psta);
+ _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
-+
-+ rtw_init_bcmc_stainfo(padapter);
++
++ rtw_init_bcmc_stainfo(padapter);
+
+ rtw_free_mlme_priv_ie_data(pmlmepriv);
+
@@ -4954,17 +4950,16 @@ index 000000000000..14576dd191f3
+
+#endif //CONFIG_NATIVEAP_MLME
+#endif //CONFIG_AP_MODE
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c
new file mode 100755
-index 000000000000..2f84a38e2fdb
+index 000000000000..39289c970543
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c
@@ -0,0 +1,1700 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -5195,10 +5190,10 @@ index 000000000000..2f84a38e2fdb
+{
+ while (len > 0) {
+ if (*data == tag && *(data+1) == len8b && len >= len8b*8)
-+ return data+2;
-+
-+ len -= (*(data+1))*8;
-+ data += (*(data+1))*8;
++ return data+2;
++
++ len -= (*(data+1))*8;
++ data += (*(data+1))*8;
+ }
+ return NULL;
+}
@@ -5208,16 +5203,16 @@ index 000000000000..2f84a38e2fdb
+{
+ struct icmp6hdr *icmphdr = (struct icmp6hdr *)data;
+ unsigned char *mac;
-+
-+ if (icmphdr->icmp6_type == NDISC_ROUTER_SOLICITATION) {
++
++ if (icmphdr->icmp6_type == NDISC_ROUTER_SOLICITATION) {
+ if (len >= 8) {
+ mac = scan_tlv(&data[8], len-8, 1, 1);
+ if (mac) {
+ _DEBUG_INFO("Router Solicitation, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n",
-+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
++ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]);
-+ memcpy(mac, replace_mac, 6);
-+ return 1;
++ memcpy(mac, replace_mac, 6);
++ return 1;
+ }
+ }
+ }
@@ -5226,55 +5221,55 @@ index 000000000000..2f84a38e2fdb
+ mac = scan_tlv(&data[16], len-16, 1, 1);
+ if (mac) {
+ _DEBUG_INFO("Router Advertisement, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n",
-+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
++ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]);
-+ memcpy(mac, replace_mac, 6);
-+ return 1;
++ memcpy(mac, replace_mac, 6);
++ return 1;
+ }
-+ }
++ }
+ }
+ else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) {
+ if (len >= 24) {
+ mac = scan_tlv(&data[24], len-24, 1, 1);
-+ if (mac) {
++ if (mac) {
+ _DEBUG_INFO("Neighbor Solicitation, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n",
-+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
++ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]);
-+ memcpy(mac, replace_mac, 6);
-+ return 1;
++ memcpy(mac, replace_mac, 6);
++ return 1;
+ }
-+ }
++ }
+ }
+ else if (icmphdr->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) {
+ if (len >= 24) {
+ mac = scan_tlv(&data[24], len-24, 2, 1);
+ if (mac) {
+ _DEBUG_INFO("Neighbor Advertisement, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n",
-+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
++ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]);
-+ memcpy(mac, replace_mac, 6);
-+ return 1;
++ memcpy(mac, replace_mac, 6);
++ return 1;
+ }
-+ }
++ }
+ }
+ else if (icmphdr->icmp6_type == NDISC_REDIRECT) {
+ if (len >= 40) {
+ mac = scan_tlv(&data[40], len-40, 2, 1);
-+ if (mac) {
++ if (mac) {
+ _DEBUG_INFO("Redirect, replace MAC From: %02x:%02x:%02x:%02x:%02x:%02x, To: %02x:%02x:%02x:%02x:%02x:%02x\n",
-+ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
++ mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],
+ replace_mac[0],replace_mac[1],replace_mac[2],replace_mac[3],replace_mac[4],replace_mac[5]);
-+ memcpy(mac, replace_mac, 6);
-+ return 1;
++ memcpy(mac, replace_mac, 6);
++ return 1;
+ }
-+ }
-+ }
++ }
++ }
+ return 0;
+}
+
+
+static void convert_ipv6_mac_to_mc(struct sk_buff *skb)
-+{
++{
+ struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + ETH_HLEN);
+ unsigned char *dst_mac = skb->data;
+
@@ -5284,7 +5279,7 @@ index 000000000000..2f84a38e2fdb
+ dst_mac[0] = 0x33;
+ dst_mac[1] = 0x33;
+ memcpy(&dst_mac[2], &iph->daddr.s6_addr32[3], 4);
-+ #if defined(__LINUX_2_6__)
++ #if defined(__LINUX_2_6__)
+ /*modified by qinjunjie,warning:should not remove next line*/
+ skb->pkt_type = PACKET_MULTICAST;
+ #endif
@@ -5336,10 +5331,10 @@ index 000000000000..2f84a38e2fdb
+ networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10] ^
+ networkAddr[11] ^ networkAddr[12] ^ networkAddr[13] ^ networkAddr[14] ^ networkAddr[15] ^
+ networkAddr[16];
-+
++
+ return x & (NAT25_HASH_SIZE - 1);
+ }
-+#endif
++#endif
+ else
+ {
+ unsigned long x = 0;
@@ -5405,8 +5400,8 @@ index 000000000000..2f84a38e2fdb
+ atomic_inc(&db->use_count);
+
+#ifdef CL_IPV6_PASS
-+ DEBUG_INFO("NAT25: Lookup M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
-+ "%02x%02x%02x%02x%02x%02x\n",
++ DEBUG_INFO("NAT25: Lookup M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
++ "%02x%02x%02x%02x%02x%02x\n",
+ db->macAddr[0],
+ db->macAddr[1],
+ db->macAddr[2],
@@ -5430,7 +5425,7 @@ index 000000000000..2f84a38e2fdb
+ db->networkAddr[14],
+ db->networkAddr[15],
+ db->networkAddr[16]);
-+#else
++#else
+ DEBUG_INFO("NAT25: Lookup M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+ db->macAddr[0],
+ db->macAddr[1],
@@ -5597,7 +5592,7 @@ index 000000000000..2f84a38e2fdb
+ int i;
+ _irqL irqL;
+ _enter_critical_bh(&priv->br_ext_lock, &irqL);
-+
++
+ for(i=0; i<NAT25_HASH_SIZE; i++)
+ {
+ struct nat25_network_db_entry *f;
@@ -5628,7 +5623,7 @@ index 000000000000..2f84a38e2fdb
+ int i;
+ _irqL irqL;
+ _enter_critical_bh(&priv->br_ext_lock, &irqL);
-+
++
+ //if(!priv->ethBrExtInfo.nat25_disable)
+ {
+ for (i=0; i<NAT25_HASH_SIZE; i++)
@@ -6387,13 +6382,13 @@ index 000000000000..2f84a38e2fdb
+ {
+ case NAT25_CHECK:
+ if (skb->data[0] & 1)
-+ return 0;
++ return 0;
+ return -1;
+
+ case NAT25_INSERT:
+ {
+ DEBUG_INFO("NAT25: Insert IP, SA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x,"
-+ " DA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
++ " DA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
+ iph->saddr.s6_addr16[0],iph->saddr.s6_addr16[1],iph->saddr.s6_addr16[2],iph->saddr.s6_addr16[3],
+ iph->saddr.s6_addr16[4],iph->saddr.s6_addr16[5],iph->saddr.s6_addr16[6],iph->saddr.s6_addr16[7],
+ iph->daddr.s6_addr16[0],iph->daddr.s6_addr16[1],iph->daddr.s6_addr16[2],iph->daddr.s6_addr16[3],
@@ -6404,10 +6399,10 @@ index 000000000000..2f84a38e2fdb
+ __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
+ __nat25_db_print(priv);
+
-+ if (iph->nexthdr == IPPROTO_ICMPV6 &&
++ if (iph->nexthdr == IPPROTO_ICMPV6 &&
+ skb->len > (ETH_HLEN + sizeof(*iph) + 4)) {
-+ if (update_nd_link_layer_addr(skb->data + ETH_HLEN + sizeof(*iph),
-+ skb->len - ETH_HLEN - sizeof(*iph), GET_MY_HWADDR(priv))) {
++ if (update_nd_link_layer_addr(skb->data + ETH_HLEN + sizeof(*iph),
++ skb->len - ETH_HLEN - sizeof(*iph), GET_MY_HWADDR(priv))) {
+ struct icmp6hdr *hdr = (struct icmp6hdr *)(skb->data + ETH_HLEN + sizeof(*iph));
+ hdr->icmp6_cksum = 0;
+ hdr->icmp6_cksum = csum_ipv6_magic(&iph->saddr, &iph->daddr,
@@ -6415,26 +6410,26 @@ index 000000000000..2f84a38e2fdb
+ IPPROTO_ICMPV6,
+ csum_partial((__u8 *)hdr, iph->payload_len, 0));
+ }
-+ }
++ }
+ }
+ }
+ return 0;
+
+ case NAT25_LOOKUP:
+ DEBUG_INFO("NAT25: Lookup IP, SA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x,"
-+ " DA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
++ " DA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
+ iph->saddr.s6_addr16[0],iph->saddr.s6_addr16[1],iph->saddr.s6_addr16[2],iph->saddr.s6_addr16[3],
+ iph->saddr.s6_addr16[4],iph->saddr.s6_addr16[5],iph->saddr.s6_addr16[6],iph->saddr.s6_addr16[7],
+ iph->daddr.s6_addr16[0],iph->daddr.s6_addr16[1],iph->daddr.s6_addr16[2],iph->daddr.s6_addr16[3],
+ iph->daddr.s6_addr16[4],iph->daddr.s6_addr16[5],iph->daddr.s6_addr16[6],iph->daddr.s6_addr16[7]);
-+
++
+
+ __nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->daddr);
+ if (!__nat25_db_network_lookup_and_replace(priv, skb, networkAddr)) {
-+#ifdef SUPPORT_RX_UNI2MCAST
++#ifdef SUPPORT_RX_UNI2MCAST
+ if (iph->daddr.s6_addr[0] == 0xff)
-+ convert_ipv6_mac_to_mc(skb);
-+#endif
++ convert_ipv6_mac_to_mc(skb);
++#endif
+ }
+ return 0;
+
@@ -6495,12 +6490,12 @@ index 000000000000..2f84a38e2fdb
+ (*((unsigned short *)(skb->data+ETH_ALEN*2)) == __constant_htons(ETH_P_IP)) &&
+ !memcmp(priv->scdb_ip, skb->data+ETH_HLEN+16, 4)) {
+ memcpy(skb->data, priv->scdb_mac, ETH_ALEN);
-+
++
+ _exit_critical_bh(&priv->br_ext_lock, &irqL);
+ }
+ else {
+ _exit_critical_bh(&priv->br_ext_lock, &irqL);
-+
++
+ retval = nat25_db_handle(priv, skb, NAT25_LOOKUP);
+ }
+ }
@@ -6663,14 +6658,14 @@ index 000000000000..2f84a38e2fdb
+#endif // CONFIG_BR_EXT
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c
new file mode 100755
-index 000000000000..f906eb3489d1
+index 000000000000..2455304514c8
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c
-@@ -0,0 +1,3035 @@
+@@ -0,0 +1,3034 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -6706,47 +6701,47 @@ index 000000000000..f906eb3489d1
+sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv)
+{
+ sint res=_SUCCESS;
-+
-+_func_enter_;
++
++_func_enter_;
+
+ _rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0);
+ //_rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0);
+ _rtw_init_sema(&(pcmdpriv->terminate_cmdthread_sema), 0);
-+
-+
++
++
+ _rtw_init_queue(&(pcmdpriv->cmd_queue));
-+
++
+ //allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf
-+
++
+ pcmdpriv->cmd_seq = 1;
-+
++
+ pcmdpriv->cmd_allocated_buf = rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ);
-+
++
+ if (pcmdpriv->cmd_allocated_buf == NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
++
+ pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ( (SIZE_PTR)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1));
-+
++
+ pcmdpriv->rsp_allocated_buf = rtw_zmalloc(MAX_RSPSZ + 4);
-+
++
+ if (pcmdpriv->rsp_allocated_buf == NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
++
+ pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 - ( (SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3);
+
+ pcmdpriv->cmd_issued_cnt = pcmdpriv->cmd_done_cnt = pcmdpriv->rsp_cnt = 0;
+
+exit:
-+
-+_func_exit_;
++
++_func_exit_;
+
+ return res;
-+
-+}
++
++}
+
+#ifdef CONFIG_C2H_WK
+static void c2h_wk_callback(_workitem *work);
@@ -6755,15 +6750,15 @@ index 000000000000..f906eb3489d1
+{
+ sint res=_SUCCESS;
+
-+_func_enter_;
++_func_enter_;
+
+#ifdef CONFIG_H2CLBK
+ _rtw_init_sema(&(pevtpriv->lbkevt_done), 0);
+ pevtpriv->lbkevt_limit = 0;
+ pevtpriv->lbkevt_num = 0;
-+ pevtpriv->cmdevt_parm = NULL;
-+#endif
-+
++ pevtpriv->cmdevt_parm = NULL;
++#endif
++
+ //allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf
+ ATOMIC_SET(&pevtpriv->event_seq, 0);
+ pevtpriv->evt_done_cnt = 0;
@@ -6773,17 +6768,17 @@ index 000000000000..f906eb3489d1
+ _rtw_init_sema(&(pevtpriv->evt_notify), 0);
+ _rtw_init_sema(&(pevtpriv->terminate_evtthread_sema), 0);
+
-+ pevtpriv->evt_allocated_buf = rtw_zmalloc(MAX_EVTSZ + 4);
++ pevtpriv->evt_allocated_buf = rtw_zmalloc(MAX_EVTSZ + 4);
+ if (pevtpriv->evt_allocated_buf == NULL){
+ res= _FAIL;
+ goto exit;
+ }
+ pevtpriv->evt_buf = pevtpriv->evt_allocated_buf + 4 - ((unsigned int)(pevtpriv->evt_allocated_buf) & 3);
-+
-+
++
++
+#ifdef CONFIG_SDIO_HCI
-+ pevtpriv->allocated_c2h_mem = rtw_zmalloc(C2H_MEM_SZ +4);
-+
++ pevtpriv->allocated_c2h_mem = rtw_zmalloc(C2H_MEM_SZ +4);
++
+ if (pevtpriv->allocated_c2h_mem == NULL){
+ res= _FAIL;
+ goto exit;
@@ -6793,7 +6788,7 @@ index 000000000000..f906eb3489d1
+ - ( (u32)(pevtpriv->allocated_c2h_mem) & 3);
+#ifdef PLATFORM_OS_XP
+ pevtpriv->pc2h_mdl= IoAllocateMdl((u8 *)pevtpriv->c2h_mem, C2H_MEM_SZ , FALSE, FALSE, NULL);
-+
++
+ if(pevtpriv->pc2h_mdl == NULL){
+ res= _FAIL;
+ goto exit;
@@ -6804,7 +6799,7 @@ index 000000000000..f906eb3489d1
+
+ _rtw_init_queue(&(pevtpriv->evt_queue));
+
-+exit:
++exit:
+
+#endif //end of CONFIG_EVENT_THREAD_MODE
+
@@ -6814,7 +6809,7 @@ index 000000000000..f906eb3489d1
+ pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1);
+#endif
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -6851,7 +6846,7 @@ index 000000000000..f906eb3489d1
+
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv \n"));
+
-+_func_exit_;
++_func_exit_;
+
+}
+
@@ -6867,17 +6862,17 @@ index 000000000000..f906eb3489d1
+
+ if (pcmdpriv->cmd_allocated_buf)
+ rtw_mfree(pcmdpriv->cmd_allocated_buf, MAX_CMDSZ + CMDBUFF_ALIGN_SZ);
-+
++
+ if (pcmdpriv->rsp_allocated_buf)
+ rtw_mfree(pcmdpriv->rsp_allocated_buf, MAX_RSPSZ + 4);
+ }
-+_func_exit_;
++_func_exit_;
+}
+
+/*
+Calling Context:
+
-+rtw_enqueue_cmd can only be called between kernel thread,
++rtw_enqueue_cmd can only be called between kernel thread,
+since only spin_lock is used.
+
+ISR/Call-Back functions can't call this sub-function.
@@ -6894,14 +6889,14 @@ index 000000000000..f906eb3489d1
+ goto exit;
+
+ //_enter_critical_bh(&queue->lock, &irqL);
-+ _enter_critical(&queue->lock, &irqL);
++ _enter_critical(&queue->lock, &irqL);
+
+ rtw_list_insert_tail(&obj->list, &queue->queue);
+
-+ //_exit_critical_bh(&queue->lock, &irqL);
++ //_exit_critical_bh(&queue->lock, &irqL);
+ _exit_critical(&queue->lock, &irqL);
+
-+exit:
++exit:
+
+_func_exit_;
+
@@ -6928,7 +6923,7 @@ index 000000000000..f906eb3489d1
+ //_exit_critical_bh(&(queue->lock), &irqL);
+ _exit_critical(&queue->lock, &irqL);
+
-+_func_exit_;
++_func_exit_;
+
+ return obj;
+}
@@ -6936,18 +6931,18 @@ index 000000000000..f906eb3489d1
+u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
+{
+ u32 res;
-+_func_enter_;
++_func_enter_;
+ res = _rtw_init_cmd_priv (pcmdpriv);
-+_func_exit_;
-+ return res;
++_func_exit_;
++ return res;
+}
+
+u32 rtw_init_evt_priv (struct evt_priv *pevtpriv)
+{
+ int res;
-+_func_enter_;
++_func_enter_;
+ res = _rtw_init_evt_priv(pevtpriv);
-+_func_exit_;
++_func_exit_;
+ return res;
+}
+
@@ -6956,35 +6951,35 @@ index 000000000000..f906eb3489d1
+_func_enter_;
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("rtw_free_evt_priv\n"));
+ _rtw_free_evt_priv(pevtpriv);
-+_func_exit_;
-+}
++_func_exit_;
++}
+
+void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv)
+{
+_func_enter_;
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("rtw_free_cmd_priv\n"));
+ _rtw_free_cmd_priv(pcmdpriv);
-+_func_exit_;
-+}
++_func_exit_;
++}
+
+int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj);
+int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
+{
+ u8 bAllow = _FALSE; //set to _TRUE to allow enqueuing cmd when hw_init_completed is _FALSE
-+
++
+ #ifdef SUPPORT_HW_RFOFF_DETECTED
+ //To decide allow or not
+ if( (pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect)
+ &&(!pcmdpriv->padapter->registrypriv.usbss_enable)
-+ )
++ )
+ {
-+ if(cmd_obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra) )
++ if(cmd_obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra) )
+ {
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;
+ if(pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID)
-+ {
++ {
+ //DBG_871X("==>enqueue POWER_SAVING_CTRL_WK_CID\n");
-+ bAllow = _TRUE;
++ bAllow = _TRUE;
+ }
+ }
+ }
@@ -7004,7 +6999,7 @@ index 000000000000..f906eb3489d1
+ //);
+
+ return _FAIL;
-+ }
++ }
+ return _SUCCESS;
+}
+
@@ -7014,9 +7009,9 @@ index 000000000000..f906eb3489d1
+{
+ int res = _FAIL;
+ PADAPTER padapter = pcmdpriv->padapter;
-+
-+_func_enter_;
-+
++
++_func_enter_;
++
+ if (cmd_obj == NULL) {
+ goto exit;
+ }
@@ -7027,7 +7022,7 @@ index 000000000000..f906eb3489d1
+ //change pcmdpriv to primary's pcmdpriv
+ if (padapter->adapter_type != PRIMARY_ADAPTER && padapter->pbuddy_adapter)
+ pcmdpriv = &(padapter->pbuddy_adapter->cmdpriv);
-+#endif
++#endif
+
+ if( _FAIL == (res=rtw_cmd_filter(pcmdpriv, cmd_obj)) ) {
+ rtw_free_cmd_obj(cmd_obj);
@@ -7038,9 +7033,9 @@ index 000000000000..f906eb3489d1
+
+ if(res == _SUCCESS)
+ _rtw_up_sema(&pcmdpriv->cmd_queue_sema);
-+
-+exit:
-+
++
++exit:
++
+_func_exit_;
+
+ return res;
@@ -7049,12 +7044,12 @@ index 000000000000..f906eb3489d1
+struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)
+{
+ struct cmd_obj *cmd_obj;
-+
-+_func_enter_;
++
++_func_enter_;
+
+ cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);
-+
-+_func_exit_;
++
++_func_exit_;
+ return cmd_obj;
+}
+
@@ -7063,7 +7058,7 @@ index 000000000000..f906eb3489d1
+_func_enter_;
+ pcmdpriv->cmd_done_cnt++;
+ //_rtw_up_sema(&(pcmdpriv->cmd_done_sema));
-+_func_exit_;
++_func_exit_;
+}
+
+void rtw_free_cmd_obj(struct cmd_obj *pcmd)
@@ -7074,21 +7069,21 @@ index 000000000000..f906eb3489d1
+ {
+ //free parmbuf in cmd_obj
+ rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz);
-+ }
-+
++ }
++
+ if(pcmd->rsp!=NULL)
+ {
+ if(pcmd->rspsz!= 0)
+ {
+ //free rsp in cmd_obj
+ rtw_mfree((unsigned char*)pcmd->rsp, pcmd->rspsz);
-+ }
-+ }
++ }
++ }
+
+ //free cmd_obj
+ rtw_mfree((unsigned char*)pcmd, sizeof(struct cmd_obj));
-+
-+_func_exit_;
++
++_func_exit_;
+}
+
+void rtw_stop_cmd_thread(_adapter *adapter)
@@ -7111,7 +7106,7 @@ index 000000000000..f906eb3489d1
+ void (*pcmd_callback)(_adapter *dev, struct cmd_obj *pcmd);
+ _adapter *padapter = (_adapter *)context;
+ struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
-+
++
+_func_enter_;
+
+ thread_enter("RTW_CMD_THREAD");
@@ -7122,7 +7117,7 @@ index 000000000000..f906eb3489d1
+ pcmdpriv->stop_req = 0;
+ pcmdpriv->cmdthd_running=_TRUE;
+ _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);
-+
++
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("start r871x rtw_cmd_thread !!!!\n"));
+
+ while(1)
@@ -7162,7 +7157,7 @@ index 000000000000..f906eb3489d1
+ if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) )
+ {
+ pcmd->res = H2C_DROPPED;
-+ goto post_process;
++ goto post_process;
+ }
+
+ if( _FAIL == rtw_cmd_filter(pcmdpriv, pcmd) ) {
@@ -7229,7 +7224,7 @@ index 000000000000..f906eb3489d1
+
+ //DBG_871X("%s: leaving... drop cmdcode:%u\n", __FUNCTION__, pcmd->cmdcode);
+
-+ rtw_free_cmd_obj(pcmd);
++ rtw_free_cmd_obj(pcmd);
+ }while(1);
+
+ _rtw_up_sema(&pcmdpriv->terminate_cmdthread_sema);
@@ -7247,37 +7242,37 @@ index 000000000000..f906eb3489d1
+ _irqL irqL;
+ int res;
+ _queue *queue = &pevtpriv->evt_queue;
-+
-+_func_enter_;
+
-+ res = _SUCCESS;
++_func_enter_;
++
++ res = _SUCCESS;
+
+ if (obj == NULL) {
+ res = _FAIL;
+ goto exit;
-+ }
++ }
+
+ _enter_critical_bh(&queue->lock, &irqL);
+
+ rtw_list_insert_tail(&obj->list, &queue->queue);
-+
++
+ _exit_critical_bh(&queue->lock, &irqL);
+
+ //rtw_evt_notify_isr(pevtpriv);
+
+exit:
-+
-+_func_exit_;
+
-+ return res;
++_func_exit_;
++
++ return res;
+}
+
+struct evt_obj *rtw_dequeue_evt(_queue *queue)
+{
+ _irqL irqL;
+ struct evt_obj *pevtobj;
-+
-+_func_enter_;
++
++_func_enter_;
+
+ _enter_critical_bh(&queue->lock, &irqL);
+
@@ -7290,10 +7285,10 @@ index 000000000000..f906eb3489d1
+ }
+
+ _exit_critical_bh(&queue->lock, &irqL);
-+
-+_func_exit_;
+
-+ return pevtobj;
++_func_exit_;
++
++ return pevtobj;
+}
+
+void rtw_free_evt_obj(struct evt_obj *pevtobj)
@@ -7302,10 +7297,10 @@ index 000000000000..f906eb3489d1
+
+ if(pevtobj->parmbuf)
+ rtw_mfree((unsigned char*)pevtobj->parmbuf, pevtobj->evtsz);
-+
++
+ rtw_mfree((unsigned char*)pevtobj, sizeof(struct evt_obj));
-+
-+_func_exit_;
++
++_func_exit_;
+}
+
+void rtw_evt_notify_isr(struct evt_priv *pevtpriv)
@@ -7313,13 +7308,13 @@ index 000000000000..f906eb3489d1
+_func_enter_;
+ pevtpriv->evt_done_cnt++;
+ _rtw_up_sema(&(pevtpriv->evt_notify));
-+_func_exit_;
++_func_exit_;
+}
+#endif
+
+
+/*
-+u8 rtw_setstandby_cmd(unsigned char *adapter)
++u8 rtw_setstandby_cmd(unsigned char *adapter)
+*/
+u8 rtw_setstandby_cmd(_adapter *padapter, uint action)
+{
@@ -7328,16 +7323,16 @@ index 000000000000..f906eb3489d1
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+
+ u8 ret = _SUCCESS;
-+
-+_func_enter_;
++
++_func_enter_;
+
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if (ph2c == NULL) {
+ ret = _FAIL;
+ goto exit;
+ }
-+
-+ psetusbsuspend = (struct usb_suspend_parm*)rtw_zmalloc(sizeof(struct usb_suspend_parm));
++
++ psetusbsuspend = (struct usb_suspend_parm*)rtw_zmalloc(sizeof(struct usb_suspend_parm));
+ if (psetusbsuspend == NULL) {
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
+ ret = _FAIL;
@@ -7348,11 +7343,11 @@ index 000000000000..f906eb3489d1
+
+ init_h2fwcmd_w_parm_no_rsp(ph2c, psetusbsuspend, GEN_CMD_CODE(_SetUsbSuspend));
+
-+ ret = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
-+exit:
-+
-+_func_exit_;
++ ret = rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++exit:
++
++_func_exit_;
+
+ return ret;
+}
@@ -7389,7 +7384,7 @@ index 000000000000..f906eb3489d1
+ if (ph2c == NULL)
+ return _FAIL;
+
-+ psurveyPara = (struct sitesurvey_parm*)rtw_zmalloc(sizeof(struct sitesurvey_parm));
++ psurveyPara = (struct sitesurvey_parm*)rtw_zmalloc(sizeof(struct sitesurvey_parm));
+ if (psurveyPara == NULL) {
+ rtw_mfree((unsigned char*) ph2c, sizeof(struct cmd_obj));
+ return _FAIL;
@@ -7444,7 +7439,7 @@ index 000000000000..f906eb3489d1
+ if (padapter->pbuddy_adapter == NULL )
+ goto full_scan_timeout;
+ if((padapter->pbuddy_adapter->mlmeextpriv.mlmext_info.state&0x03) == WIFI_FW_AP_STATE)
-+ _set_timer(&pmlmepriv->scan_to_timer,
++ _set_timer(&pmlmepriv->scan_to_timer,
+ SURVEY_TO * ( padapter->mlmeextpriv.max_chan_nums + ( padapter->mlmeextpriv.max_chan_nums / RTW_SCAN_NUM_OF_CH ) * RTW_STAY_AP_CH_MILLISECOND ) + 1000 );
+ else
+#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE
@@ -7458,7 +7453,7 @@ index 000000000000..f906eb3489d1
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
+ }
+ +
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -7470,7 +7465,7 @@ index 000000000000..f906eb3489d1
+ struct cmd_priv* pcmdpriv = &padapter->cmdpriv;
+ u8 res = _SUCCESS;
+
-+_func_enter_;
++_func_enter_;
+ +
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if (ph2c == NULL) {
@@ -7478,7 +7473,7 @@ index 000000000000..f906eb3489d1
+ goto exit;
+ }
+
-+ pbsetdataratepara = (struct setdatarate_parm*)rtw_zmalloc(sizeof(struct setdatarate_parm));
++ pbsetdataratepara = (struct setdatarate_parm*)rtw_zmalloc(sizeof(struct setdatarate_parm));
+ if (pbsetdataratepara == NULL) {
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
+ res = _FAIL;
@@ -7515,7 +7510,7 @@ index 000000000000..f906eb3489d1
+ res= _FAIL;
+ goto exit;
+ }
-+ pssetbasicratepara = (struct setbasicrate_parm*)rtw_zmalloc(sizeof(struct setbasicrate_parm));
++ pssetbasicratepara = (struct setbasicrate_parm*)rtw_zmalloc(sizeof(struct setbasicrate_parm));
+
+ if (pssetbasicratepara == NULL) {
+ rtw_mfree((u8*) ph2c, sizeof(struct cmd_obj));
@@ -7525,19 +7520,19 @@ index 000000000000..f906eb3489d1
+
+ init_h2fwcmd_w_parm_no_rsp(ph2c, pssetbasicratepara, _SetBasicRate_CMD_);
+
-+ _rtw_memcpy(pssetbasicratepara->basicrates, rateset, NumRates);
++ _rtw_memcpy(pssetbasicratepara->basicrates, rateset, NumRates);
+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+exit:
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
+
+
+/*
-+unsigned char rtw_setphy_cmd(unsigned char *adapter)
++unsigned char rtw_setphy_cmd(unsigned char *adapter)
+
+1. be called only after rtw_update_registrypriv_dev_network( ~) or mp testing program
+2. for AdHoc/Ap mode or mp mode?
@@ -7552,14 +7547,14 @@ index 000000000000..f906eb3489d1
+// struct registry_priv* pregistry_priv = &padapter->registrypriv;
+ u8 res=_SUCCESS;
+
-+_func_enter_;
++_func_enter_;
+
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+ psetphypara = (struct setphy_parm*)rtw_zmalloc(sizeof(struct setphy_parm));
++ psetphypara = (struct setphy_parm*)rtw_zmalloc(sizeof(struct setphy_parm));
+
+ if(psetphypara==NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
@@ -7574,17 +7569,17 @@ index 000000000000..f906eb3489d1
+ psetphypara->modem = modem;
+ psetphypara->rfchannel = ch;
+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+exit:
-+_func_exit_;
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++exit:
++_func_exit_;
+ return res;
+}
+
+u8 rtw_setbbreg_cmd(_adapter*padapter, u8 offset, u8 val)
-+{
++{
+ struct cmd_obj* ph2c;
+ struct writeBB_parm* pwritebbparm;
-+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
++ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
+_func_enter_;
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
@@ -7592,7 +7587,7 @@ index 000000000000..f906eb3489d1
+ res= _FAIL;
+ goto exit;
+ }
-+ pwritebbparm = (struct writeBB_parm*)rtw_zmalloc(sizeof(struct writeBB_parm));
++ pwritebbparm = (struct writeBB_parm*)rtw_zmalloc(sizeof(struct writeBB_parm));
+
+ if(pwritebbparm==NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
@@ -7600,31 +7595,31 @@ index 000000000000..f906eb3489d1
+ goto exit;
+ }
+
-+ init_h2fwcmd_w_parm_no_rsp(ph2c, pwritebbparm, GEN_CMD_CODE(_SetBBReg));
++ init_h2fwcmd_w_parm_no_rsp(ph2c, pwritebbparm, GEN_CMD_CODE(_SetBBReg));
+
+ pwritebbparm->offset = offset;
+ pwritebbparm->value = val;
+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+exit:
-+_func_exit_;
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++exit:
++_func_exit_;
+ return res;
+}
+
+u8 rtw_getbbreg_cmd(_adapter *padapter, u8 offset, u8 *pval)
-+{
++{
+ struct cmd_obj* ph2c;
+ struct readBB_parm* prdbbparm;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
-+
++
+_func_enter_;
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res=_FAIL;
+ goto exit;
+ }
-+ prdbbparm = (struct readBB_parm*)rtw_zmalloc(sizeof(struct readBB_parm));
++ prdbbparm = (struct readBB_parm*)rtw_zmalloc(sizeof(struct readBB_parm));
+
+ if(prdbbparm ==NULL){
+ rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj));
@@ -7637,28 +7632,28 @@ index 000000000000..f906eb3489d1
+ ph2c->cmdsz = sizeof(struct readBB_parm);
+ ph2c->rsp = pval;
+ ph2c->rspsz = sizeof(struct readBB_rsp);
-+
++
+ prdbbparm ->offset = offset;
-+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+exit:
-+_func_exit_;
++_func_exit_;
+ return res;
+}
+
+u8 rtw_setrfreg_cmd(_adapter *padapter, u8 offset, u32 val)
-+{
++{
+ struct cmd_obj* ph2c;
+ struct writeRF_parm* pwriterfparm;
-+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
++ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
+_func_enter_;
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
-+ res= _FAIL;
++ res= _FAIL;
+ goto exit;
+ }
-+ pwriterfparm = (struct writeRF_parm*)rtw_zmalloc(sizeof(struct writeRF_parm));
++ pwriterfparm = (struct writeRF_parm*)rtw_zmalloc(sizeof(struct writeRF_parm));
+
+ if(pwriterfparm==NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
@@ -7666,22 +7661,22 @@ index 000000000000..f906eb3489d1
+ goto exit;
+ }
+
-+ init_h2fwcmd_w_parm_no_rsp(ph2c, pwriterfparm, GEN_CMD_CODE(_SetRFReg));
++ init_h2fwcmd_w_parm_no_rsp(ph2c, pwriterfparm, GEN_CMD_CODE(_SetRFReg));
+
+ pwriterfparm->offset = offset;
+ pwriterfparm->value = val;
+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+exit:
-+_func_exit_;
++_func_exit_;
+ return res;
+}
+
+u8 rtw_getrfreg_cmd(_adapter *padapter, u8 offset, u8 *pval)
-+{
++{
+ struct cmd_obj* ph2c;
+ struct readRF_parm* prdrfparm;
-+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
++ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
+
+_func_enter_;
@@ -7692,7 +7687,7 @@ index 000000000000..f906eb3489d1
+ goto exit;
+ }
+
-+ prdrfparm = (struct readRF_parm*)rtw_zmalloc(sizeof(struct readRF_parm));
++ prdrfparm = (struct readRF_parm*)rtw_zmalloc(sizeof(struct readRF_parm));
+ if(prdrfparm ==NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -7705,40 +7700,40 @@ index 000000000000..f906eb3489d1
+ ph2c->cmdsz = sizeof(struct readRF_parm);
+ ph2c->rsp = pval;
+ ph2c->rspsz = sizeof(struct readRF_rsp);
-+
++
+ prdrfparm ->offset = offset;
-+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
+
+void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
-+{
-+ _func_enter_;
-+
++{
++ _func_enter_;
++
+ //rtw_free_cmd_obj(pcmd);
+ rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz);
+ rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj));
-+
-+#ifdef CONFIG_MP_INCLUDED
++
++#ifdef CONFIG_MP_INCLUDED
+ padapter->mppriv.workparam.bcompleted= _TRUE;
-+#endif
-+_func_exit_;
++#endif
++_func_exit_;
+}
+
+void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
+{
-+ _func_enter_;
++ _func_enter_;
+
+ rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz);
+ rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj));
-+
-+#ifdef CONFIG_MP_INCLUDED
++
++#ifdef CONFIG_MP_INCLUDED
+ padapter->mppriv.workparam.bcompleted= _TRUE;
+#endif
+
@@ -7758,11 +7753,11 @@ index 000000000000..f906eb3489d1
+ rtw_led_control(padapter, LED_CTL_START_TO_LINK);
+
+ if (pmlmepriv->assoc_ssid.SsidLength == 0){
-+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,(" createbss for Any SSid:%s\n",pmlmepriv->assoc_ssid.Ssid));
++ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,(" createbss for Any SSid:%s\n",pmlmepriv->assoc_ssid.Ssid));
+ } else {
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,(" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
+ }
-+
++
+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(pcmd==NULL){
+ res= _FAIL;
@@ -7774,9 +7769,9 @@ index 000000000000..f906eb3489d1
+ pcmd->parmbuf = (unsigned char *)pdev_network;
+ pcmd->cmdsz = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX*)pdev_network);
+ pcmd->rsp = NULL;
-+ pcmd->rspsz = 0;
-+
-+ pdev_network->Length = pcmd->cmdsz;
++ pcmd->rspsz = 0;
++
++ pdev_network->Length = pcmd->cmdsz;
+
+#ifdef CONFIG_RTL8712
+ //notes: translate IELength & Length after assign the Length to cmdsz;
@@ -7785,11 +7780,11 @@ index 000000000000..f906eb3489d1
+ pdev_network->Ssid.SsidLength = cpu_to_le32(pdev_network->Ssid.SsidLength);
+#endif
+
-+ res = rtw_enqueue_cmd(pcmdpriv, pcmd);
++ res = rtw_enqueue_cmd(pcmdpriv, pcmd);
+
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -7799,9 +7794,9 @@ index 000000000000..f906eb3489d1
+ struct cmd_obj* pcmd;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
-+
++
+_func_enter_;
-+
++
+ pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(pcmd==NULL){
+ res= _FAIL;
@@ -7818,10 +7813,10 @@ index 000000000000..f906eb3489d1
+ res = rtw_enqueue_cmd(pcmdpriv, pcmd);
+
+exit:
-+
-+_func_exit_;
+
-+ return res;
++_func_exit_;
++
++ return res;
+}
+
+u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork)
@@ -7856,12 +7851,12 @@ index 000000000000..f906eb3489d1
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));
+ goto exit;
+ }
-+ /* // for IEs is pointer
-+ t_len = sizeof (ULONG) + sizeof (NDIS_802_11_MAC_ADDRESS) + 2 +
-+ sizeof (NDIS_802_11_SSID) + sizeof (ULONG) +
-+ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) +
-+ sizeof (NDIS_802_11_CONFIGURATION) +
-+ sizeof (NDIS_802_11_NETWORK_INFRASTRUCTURE) +
++ /* // for IEs is pointer
++ t_len = sizeof (ULONG) + sizeof (NDIS_802_11_MAC_ADDRESS) + 2 +
++ sizeof (NDIS_802_11_SSID) + sizeof (ULONG) +
++ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) +
++ sizeof (NDIS_802_11_CONFIGURATION) +
++ sizeof (NDIS_802_11_NETWORK_INFRASTRUCTURE) +
+ sizeof (NDIS_802_11_RATES_EX)+ sizeof(WLAN_PHY_INFO)+ sizeof (ULONG) + MAX_IE_SZ;
+ */
+ //for IEs is fix buf size
@@ -7894,18 +7889,18 @@ index 000000000000..f906eb3489d1
+ {
+ if(pcmd !=NULL)
+ rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj));
-+
++
+ res=_FAIL;
-+
++
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd :psecnetwork==NULL!!!\n"));
-+
++
+ goto exit;
+ }
+
+ _rtw_memset(psecnetwork, 0, t_len);
+
+ _rtw_memcpy(psecnetwork, &pnetwork->network, get_WLAN_BSSID_EX_sz(&pnetwork->network));
-+
++
+ auth=&psecuritypriv->authenticator_ie[0];
+ psecuritypriv->authenticator_ie[0]=(unsigned char)psecnetwork->IELength;
+
@@ -7914,13 +7909,13 @@ index 000000000000..f906eb3489d1
+ } else {
+ _rtw_memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));
+ }
-+
++
+ psecnetwork->IELength = 0;
+ // Added by Albert 2009/02/18
+ // If the the driver wants to use the bssid to create the connection.
+ // If not, we have to copy the connecting AP's MAC address to it so that
+ // the driver just has the bssid information for PMKIDList searching.
-+
++
+ if ( pmlmepriv->assoc_by_bssid == _FALSE )
+ {
+ _rtw_memcpy( &pmlmepriv->assoc_bssid[ 0 ], &pnetwork->network.MacAddress[ 0 ], ETH_ALEN );
@@ -7930,23 +7925,23 @@ index 000000000000..f906eb3489d1
+
+
+ pqospriv->qos_option = 0;
-+
-+ if(pregistrypriv->wmm_enable)
-+ {
++
++ if(pregistrypriv->wmm_enable)
++ {
+ u32 tmp_len;
-+
-+ tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength, psecnetwork->IELength);
+
-+ if (psecnetwork->IELength != tmp_len)
++ tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength, psecnetwork->IELength);
++
++ if (psecnetwork->IELength != tmp_len)
+ {
+ psecnetwork->IELength = tmp_len;
+ pqospriv->qos_option = 1; //There is WMM IE in this corresp. beacon
+ }
-+ else
++ else
+ {
+ pqospriv->qos_option = 0;//There is no WMM IE in this corresp. beacon
-+ }
-+ }
++ }
++ }
+
+#ifdef CONFIG_80211N_HT
+ phtpriv->ht_option = _FALSE;
@@ -7960,7 +7955,7 @@ index 000000000000..f906eb3489d1
+ ( padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_ ))
+ {
+ //rtw_restructure_ht_ie
-+ rtw_restructure_ht_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0],
++ rtw_restructure_ht_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0],
+ pnetwork->network.IELength, &psecnetwork->IELength, (u8)psecnetwork->Configuration.DSConfig );
+ }
+ }
@@ -7981,11 +7976,11 @@ index 000000000000..f906eb3489d1
+ _rtw_memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->IEs[0], (256-1));
+ }
+ #endif
-+
++
+ pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion
+
+#ifdef CONFIG_RTL8712
-+ //wlan_network endian conversion
++ //wlan_network endian conversion
+ psecnetwork->Length = cpu_to_le32(psecnetwork->Length);
+ psecnetwork->Ssid.SsidLength= cpu_to_le32(psecnetwork->Ssid.SsidLength);
+ psecnetwork->Privacy = cpu_to_le32(psecnetwork->Privacy);
@@ -7997,10 +7992,10 @@ index 000000000000..f906eb3489d1
+ psecnetwork->Configuration.FHConfig.DwellTime=cpu_to_le32(psecnetwork->Configuration.FHConfig.DwellTime);
+ psecnetwork->Configuration.FHConfig.HopPattern=cpu_to_le32(psecnetwork->Configuration.FHConfig.HopPattern);
+ psecnetwork->Configuration.FHConfig.HopSet=cpu_to_le32(psecnetwork->Configuration.FHConfig.HopSet);
-+ psecnetwork->Configuration.FHConfig.Length=cpu_to_le32(psecnetwork->Configuration.FHConfig.Length);
++ psecnetwork->Configuration.FHConfig.Length=cpu_to_le32(psecnetwork->Configuration.FHConfig.Length);
+ psecnetwork->Configuration.Length = cpu_to_le32(psecnetwork->Configuration.Length);
+ psecnetwork->InfrastructureMode = cpu_to_le32(psecnetwork->InfrastructureMode);
-+ psecnetwork->IELength = cpu_to_le32(psecnetwork->IELength);
++ psecnetwork->IELength = cpu_to_le32(psecnetwork->IELength);
+#endif
+
+ _rtw_init_listhead(&pcmd->list);
@@ -8012,7 +8007,7 @@ index 000000000000..f906eb3489d1
+ res = rtw_enqueue_cmd(pcmdpriv, pcmd);
+
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -8056,7 +8051,7 @@ index 000000000000..f906eb3489d1
+
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8071,12 +8066,12 @@ index 000000000000..f906eb3489d1
+
+_func_enter_;
+
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FALSE;
+ goto exit;
+ }
-+ psetop = (struct setopmode_parm*)rtw_zmalloc(sizeof(struct setopmode_parm));
++ psetop = (struct setopmode_parm*)rtw_zmalloc(sizeof(struct setopmode_parm));
+
+ if(psetop==NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
@@ -8091,7 +8086,7 @@ index 000000000000..f906eb3489d1
+
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8102,7 +8097,7 @@ index 000000000000..f906eb3489d1
+ struct set_stakey_parm *psetstakey_para;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ struct set_stakey_rsp *psetstakey_rsp = NULL;
-+
++
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
+ struct sta_info* sta = (struct sta_info* )psta;
@@ -8123,7 +8118,7 @@ index 000000000000..f906eb3489d1
+ goto exit;
+ }
+
-+ psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp));
++ psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp));
+ if(psetstakey_rsp == NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
+ rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm));
@@ -8136,9 +8131,9 @@ index 000000000000..f906eb3489d1
+ ph2c->rspsz = sizeof(struct set_stakey_rsp);
+
+ _rtw_memcpy(psetstakey_para->addr, sta->hwaddr,ETH_ALEN);
-+
++
+ if(check_fwstate(pmlmepriv, WIFI_STATION_STATE)){
-+#ifdef CONFIG_TDLS
++#ifdef CONFIG_TDLS
+ if(sta->tdls_sta_state&TDLS_LINKED_STATE)
+ psetstakey_para->algorithm=(u8)sta->dot118021XPrivacy;
+ else
@@ -8162,11 +8157,11 @@ index 000000000000..f906eb3489d1
+ //jeff: set this becasue at least sw key is ready
+ padapter->securitypriv.busetkipkey=_TRUE;
+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8176,7 +8171,7 @@ index 000000000000..f906eb3489d1
+ struct cmd_obj* ph2c;
+ struct set_stakey_parm *psetstakey_para;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
-+ struct set_stakey_rsp *psetstakey_rsp = NULL;
++ struct set_stakey_rsp *psetstakey_rsp = NULL;
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
+ struct sta_info* sta = (struct sta_info* )psta;
@@ -8203,7 +8198,7 @@ index 000000000000..f906eb3489d1
+ goto exit;
+ }
+
-+ psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp));
++ psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp));
+ if(psetstakey_rsp == NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
+ rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm));
@@ -8220,14 +8215,14 @@ index 000000000000..f906eb3489d1
+ psetstakey_para->algorithm = _NO_PRIVACY_;
+
+ psetstakey_para->id = entry;
-+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++
+ }
-+
++
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8235,17 +8230,17 @@ index 000000000000..f906eb3489d1
+u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table)
+{
+ struct cmd_obj* ph2c;
-+ struct setratable_parm * psetrttblparm;
++ struct setratable_parm * psetrttblparm;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
-+_func_enter_;
++_func_enter_;
+
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+ psetrttblparm = (struct setratable_parm*)rtw_zmalloc(sizeof(struct setratable_parm));
++ psetrttblparm = (struct setratable_parm*)rtw_zmalloc(sizeof(struct setratable_parm));
+
+ if(psetrttblparm==NULL){
+ rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj));
@@ -8257,9 +8252,9 @@ index 000000000000..f906eb3489d1
+
+ _rtw_memcpy(psetrttblparm,prate_table,sizeof(struct setratable_parm));
+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+exit:
-+_func_exit_;
++_func_exit_;
+ return res;
+
+}
@@ -8267,17 +8262,17 @@ index 000000000000..f906eb3489d1
+u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval)
+{
+ struct cmd_obj* ph2c;
-+ struct getratable_parm * pgetrttblparm;
++ struct getratable_parm * pgetrttblparm;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
-+_func_enter_;
++_func_enter_;
+
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+ pgetrttblparm = (struct getratable_parm*)rtw_zmalloc(sizeof(struct getratable_parm));
++ pgetrttblparm = (struct getratable_parm*)rtw_zmalloc(sizeof(struct getratable_parm));
+
+ if(pgetrttblparm==NULL){
+ rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj));
@@ -8293,12 +8288,12 @@ index 000000000000..f906eb3489d1
+ ph2c->cmdsz = sizeof(struct getratable_parm);
+ ph2c->rsp = (u8*)pval;
+ ph2c->rspsz = sizeof(struct getratable_rsp);
-+
++
+ pgetrttblparm ->rsvd = 0x0;
-+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+exit:
-+_func_exit_;
++_func_exit_;
+ return res;
+
+}
@@ -8307,12 +8302,12 @@ index 000000000000..f906eb3489d1
+{
+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+ struct cmd_obj* ph2c;
-+ struct set_assocsta_parm *psetassocsta_para;
++ struct set_assocsta_parm *psetassocsta_para;
+ struct set_stakey_rsp *psetassocsta_rsp = NULL;
+
+ u8 res=_SUCCESS;
+
-+_func_enter_;
++_func_enter_;
+
+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
@@ -8327,7 +8322,7 @@ index 000000000000..f906eb3489d1
+ goto exit;
+ }
+
-+ psetassocsta_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_assocsta_rsp));
++ psetassocsta_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_assocsta_rsp));
+ if(psetassocsta_rsp==NULL){
+ rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj));
+ rtw_mfree((u8 *) psetassocsta_para, sizeof(struct set_assocsta_parm));
@@ -8339,12 +8334,12 @@ index 000000000000..f906eb3489d1
+ ph2c->rspsz = sizeof(struct set_assocsta_rsp);
+
+ _rtw_memcpy(psetassocsta_para->addr, mac_addr,ETH_ALEN);
-+
-+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
+
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+ }
@@ -8356,16 +8351,16 @@ index 000000000000..f906eb3489d1
+ struct addBaReq_parm *paddbareq_parm;
+
+ u8 res=_SUCCESS;
-+
-+_func_enter_;
+
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++_func_enter_;
++
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ paddbareq_parm = (struct addBaReq_parm*)rtw_zmalloc(sizeof(struct addBaReq_parm));
++
++ paddbareq_parm = (struct addBaReq_parm*)rtw_zmalloc(sizeof(struct addBaReq_parm));
+ if(paddbareq_parm==NULL){
+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -8379,11 +8374,11 @@ index 000000000000..f906eb3489d1
+
+ //DBG_871X("rtw_addbareq_cmd, tid=%d\n", tid);
+
-+ //rtw_enqueue_cmd(pcmdpriv, ph2c);
++ //rtw_enqueue_cmd(pcmdpriv, ph2c);
+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -8392,19 +8387,19 @@ index 000000000000..f906eb3489d1
+u8 rtw_reset_securitypriv_cmd(_adapter*padapter)
+{
+ struct cmd_obj* ph2c;
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
-+
-+_func_enter_;
+
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++_func_enter_;
++
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
++
++ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+ if(pdrvextra_cmd_parm==NULL){
+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -8417,12 +8412,12 @@ index 000000000000..f906eb3489d1
+
+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
-+
-+ //rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++ //rtw_enqueue_cmd(pcmdpriv, ph2c);
+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -8432,19 +8427,19 @@ index 000000000000..f906eb3489d1
+u8 rtw_free_assoc_resources_cmd(_adapter*padapter)
+{
+ struct cmd_obj* ph2c;
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
-+
-+_func_enter_;
+
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++_func_enter_;
++
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
++
++ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+ if(pdrvextra_cmd_parm==NULL){
+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -8457,12 +8452,12 @@ index 000000000000..f906eb3489d1
+
+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
-+
-+ //rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++ //rtw_enqueue_cmd(pcmdpriv, ph2c);
+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -8473,11 +8468,11 @@ index 000000000000..f906eb3489d1
+u8 rtw_dynamic_chk_wk_cmd(_adapter*padapter)
+{
+ struct cmd_obj* ph2c;
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+ struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
+ u8 res=_SUCCESS;
-+
-+_func_enter_;
++
++_func_enter_;
+
+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
+ goto exit;
@@ -8488,13 +8483,13 @@ index 000000000000..f906eb3489d1
+ pcmdpriv = &(padapter->pbuddy_adapter->cmdpriv);
+#endif
+
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
++
++ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+ if(pdrvextra_cmd_parm==NULL){
+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -8507,12 +8502,12 @@ index 000000000000..f906eb3489d1
+
+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
-+
-+ //rtw_enqueue_cmd(pcmdpriv, ph2c);
++
++ //rtw_enqueue_cmd(pcmdpriv, ph2c);
+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -8559,7 +8554,7 @@ index 000000000000..f906eb3489d1
+ /* no need to enqueue, do the cmd hdl directly and free cmd parameter */
+ if( H2C_SUCCESS !=set_ch_hdl(padapter, (u8 *)set_ch_parm) )
+ res = _FAIL;
-+
++
+ rtw_mfree((u8 *)set_ch_parm, sizeof(*set_ch_parm));
+ }
+
@@ -8569,7 +8564,7 @@ index 000000000000..f906eb3489d1
+
+ DBG_871X(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res);
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8618,17 +8613,17 @@ index 000000000000..f906eb3489d1
+ //no need to enqueue, do the cmd hdl directly and free cmd parameter
+ if( H2C_SUCCESS !=set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param) )
+ res = _FAIL;
-+
++
+ rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param));
+ }
+
+ //do something based on res...
+ if(res == _SUCCESS)
+ padapter->mlmepriv.ChannelPlan = chplan;
-+
++
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8644,7 +8639,7 @@ index 000000000000..f906eb3489d1
+_func_enter_;
+
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n"));
-+
++
+ pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(pcmdobj == NULL){
+ res=_FAIL;
@@ -8659,13 +8654,13 @@ index 000000000000..f906eb3489d1
+ }
+
+ ledBlink_param->pLed=pLed;
-+
++
+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, ledBlink_param, GEN_CMD_CODE(_LedBlink));
+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj);
-+
++
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8682,7 +8677,7 @@ index 000000000000..f906eb3489d1
+_func_enter_;
+
+ RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n"));
-+
++
+ pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(pcmdobj == NULL){
+ res=_FAIL;
@@ -8697,13 +8692,13 @@ index 000000000000..f906eb3489d1
+ }
+
+ setChannelSwitch_param->new_ch_no=new_ch_no;
-+
++
+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelSwitch_param, GEN_CMD_CODE(_SetChannelSwitch));
+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj);
-+
++
+exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8737,18 +8732,18 @@ index 000000000000..f906eb3489d1
+ }
+
+ _rtw_spinlock(&(padapter->tdlsinfo.cmd_lock));
-+ _rtw_memcpy(TDLSoption->addr, addr, 6);
++ _rtw_memcpy(TDLSoption->addr, addr, 6);
+ TDLSoption->option = option;
+ _rtw_spinunlock(&(padapter->tdlsinfo.cmd_lock));
+ init_h2fwcmd_w_parm_no_rsp(pcmdobj, TDLSoption, GEN_CMD_CODE(_TDLS));
+ res = rtw_enqueue_cmd(pcmdpriv, pcmdobj);
+
+#endif //CONFIG_TDLS
-+
++
+exit:
+
+
-+_func_exit_;
++_func_exit_;
+
+ return res;
+}
@@ -8771,7 +8766,7 @@ index 000000000000..f906eb3489d1
+ //
+ // Determine if our traffic is busy now
+ //
-+ if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)
++ if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE)
+ /*&& !MgntInitAdapterInProgress(pMgntInfo)*/)
+ {
+
@@ -8871,19 +8866,19 @@ index 000000000000..f906eb3489d1
+ pmlmepriv->LinkDetectInfo.bHigherBusyTraffic = bHigherBusyTraffic;
+ pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic = bHigherBusyRxTraffic;
+ pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic;
-+
++
+}
+
+void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz);
+void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
+{
+ struct mlme_priv *pmlmepriv;
-+
++
+ if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
+ return;
+
+ if((void*)padapter != (void*)pbuf && padapter->pbuddy_adapter == NULL)
-+ return;
++ return;
+
+ padapter = (_adapter *)pbuf;
+
@@ -8895,25 +8890,25 @@ index 000000000000..f906eb3489d1
+#ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
+#ifdef CONFIG_AP_MODE
+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
-+ {
++ {
+ expire_timeout_chk(padapter);
+ }
+#endif
+#endif //CONFIG_ACTIVE_KEEP_ALIVE_CHECK
+
-+ #ifdef DBG_CONFIG_ERROR_DETECT
++ #ifdef DBG_CONFIG_ERROR_DETECT
+ rtw_hal_sreset_xmit_status_check(padapter);
-+ #endif
++ #endif
+
+ //if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==_FALSE)
+ {
-+ linked_status_chk(padapter);
++ linked_status_chk(padapter);
+ traffic_status_watchdog(padapter);
+ }
+
+ rtw_hal_dm_watchdog(padapter);
+
-+ //check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
++ //check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
+
+}
+
@@ -8925,7 +8920,7 @@ index 000000000000..f906eb3489d1
+ struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+ u8 mstatus;
-+
++
+_func_enter_;
+
+ if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)
@@ -8973,11 +8968,11 @@ index 000000000000..f906eb3489d1
+u8 rtw_lps_ctrl_wk_cmd(_adapter*padapter, u8 lps_ctrl_type, u8 enqueue)
+{
+ struct cmd_obj *ph2c;
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+ //struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
+ u8 res = _SUCCESS;
-+
++
+_func_enter_;
+
+ //if(!pwrctrlpriv->bLeisurePs)
@@ -8990,13 +8985,13 @@ index 000000000000..f906eb3489d1
+
+ if(enqueue)
+ {
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
++
++ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+ if(pdrvextra_cmd_parm==NULL){
+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -9015,9 +9010,9 @@ index 000000000000..f906eb3489d1
+ {
+ lps_ctrl_wk_hdl(padapter, lps_ctrl_type);
+ }
-+
++
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -9035,7 +9030,7 @@ index 000000000000..f906eb3489d1
+u8 rtw_antenna_select_cmd(_adapter*padapter, u8 antenna,u8 enqueue)
+{
+ struct cmd_obj *ph2c;
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+ u8 bSupportAntDiv = _FALSE;
+ u8 res = _SUCCESS;
@@ -9046,7 +9041,7 @@ index 000000000000..f906eb3489d1
+
+ if(_TRUE == enqueue)
+ {
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
@@ -9103,7 +9098,7 @@ index 000000000000..f906eb3489d1
+ struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+ u8 res = _SUCCESS;
-+
++
+_func_enter_;
+
+ if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@@ -9111,13 +9106,13 @@ index 000000000000..f906eb3489d1
+ return res;
+ }
+
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
++
++ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+ if(pdrvextra_cmd_parm==NULL){
+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -9131,9 +9126,9 @@ index 000000000000..f906eb3489d1
+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -9144,9 +9139,9 @@ index 000000000000..f906eb3489d1
+u8 rtw_ps_cmd(_adapter*padapter)
+{
+ struct cmd_obj *ppscmd;
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
-+
++
+ u8 res = _SUCCESS;
+_func_enter_;
+
@@ -9154,28 +9149,28 @@ index 000000000000..f906eb3489d1
+ if (padapter->adapter_type != PRIMARY_ADAPTER)
+ goto exit;
+#endif
-+
-+ ppscmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++
++ ppscmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ppscmd==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
++
++ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+ if(pdrvextra_cmd_parm==NULL){
+ rtw_mfree((unsigned char *)ppscmd, sizeof(struct cmd_obj));
+ res= _FAIL;
+ goto exit;
+ }
+
-+ pdrvextra_cmd_parm->ec_id = POWER_SAVING_CTRL_WK_CID;
++ pdrvextra_cmd_parm->ec_id = POWER_SAVING_CTRL_WK_CID;
+ pdrvextra_cmd_parm->pbuf = NULL;
+ init_h2fwcmd_w_parm_no_rsp(ppscmd, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
+ res = rtw_enqueue_cmd(pcmdpriv, ppscmd);
-+
++
+exit:
-+
++
+_func_exit_;
+
+ return res;
@@ -9202,36 +9197,36 @@ index 000000000000..f906eb3489d1
+ rtw_msleep_os(100);
+
+ cnt++;
-+
++
+ if(cnt>10)
-+ break;
++ break;
+ }
+
+ if(cnt<=10)
+ {
+ pstapriv->tim_bitmap &= ~BIT(0);
+ pstapriv->sta_dz_bitmap &= ~BIT(0);
-+
++
+ update_beacon(padapter, _TIM_IE_, NULL, _FALSE);
-+ }
-+ }
-+
++ }
++ }
++
+}
+
+u8 rtw_chk_hi_queue_cmd(_adapter*padapter)
+{
+ struct cmd_obj *ph2c;
-+ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
++ struct drvextra_cmd_parm *pdrvextra_cmd_parm;
+ struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+ u8 res = _SUCCESS;
-+
-+ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
++
++ ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
+ if(ph2c==NULL){
+ res= _FAIL;
+ goto exit;
+ }
-+
-+ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
++
++ pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+ if(pdrvextra_cmd_parm==NULL){
+ rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
+ res= _FAIL;
@@ -9245,9 +9240,9 @@ index 000000000000..f906eb3489d1
+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
+exit:
-+
++
+ return res;
+
+}
@@ -9280,9 +9275,9 @@ index 000000000000..f906eb3489d1
+ init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
+
+ res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-+
++
+exit:
-+
++
+ return res;
+}
+
@@ -9295,7 +9290,7 @@ index 000000000000..f906eb3489d1
+ /* No c2h event in cmd_obj, read c2h event before handling*/
+ if (c2h_evt_read(adapter, buf) == _SUCCESS) {
+ c2h_evt = (struct c2h_evt_hdr *)buf;
-+
++
+ if (filter && filter(c2h_evt->id) == _FALSE)
+ goto exit;
+
@@ -9340,7 +9335,7 @@ index 000000000000..f906eb3489d1
+ rtw_mfree((u8*)c2h_evt, 16);
+ continue;
+ }
-+
++
+ if (ccx_id_filter(c2h_evt->id) == _TRUE) {
+ /* Handle CCX report here */
+ rtw_hal_c2h_handler(adapter, c2h_evt);
@@ -9363,14 +9358,14 @@ index 000000000000..f906eb3489d1
+ return H2C_PARAMETERS_ERROR;
+
+ pdrvextra_cmd = (struct drvextra_cmd_parm*)pbuf;
-+
++
+ switch(pdrvextra_cmd->ec_id)
+ {
+ case DYNAMIC_CHK_WK_CID:
+ dynamic_chk_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
+ break;
+ case POWER_SAVING_CTRL_WK_CID:
-+ power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
++ power_saving_wk_hdl(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
+ break;
+#ifdef CONFIG_LPS
+ case LPS_CTRL_WK_CID:
@@ -9443,26 +9438,26 @@ index 000000000000..f906eb3489d1
+ else if (pcmd->res != H2C_SUCCESS) {
+ _set_timer(&pmlmepriv->scan_to_timer, 1);
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));
-+ }
++ }
+
+ // free cmd
+ rtw_free_cmd_obj(pcmd);
+
-+_func_exit_;
++_func_exit_;
+}
+void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd)
+{
+ _irqL irqL;
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
-+
-+_func_enter_;
++++
++_func_enter_;
+
+ if (pcmd->res != H2C_SUCCESS)
+ {
+ _enter_critical_bh(&pmlmepriv->lock, &irqL);
+ set_fwstate(pmlmepriv, _FW_LINKED);
+ _exit_critical_bh(&pmlmepriv->lock, &irqL);
-+
++
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ***Error: disconnect_cmd_callback Fail ***\n."));
+ +
+ goto exit;
@@ -9474,10 +9469,10 @@ index 000000000000..f906eb3489d1
+ +
+ // free cmd
+ rtw_free_cmd_obj(pcmd);
-+
++
+exit:
-+
-+_func_exit_;
++
++_func_exit_;
+} +}
+ +
+ +
@@ -9485,7 +9480,7 @@ index 000000000000..f906eb3489d1
+{ +{
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+
-+_func_enter_;
++_func_enter_;
+
+ if(pcmd->res == H2C_DROPPED)
+ {
@@ -9494,75 +9489,75 @@ index 000000000000..f906eb3489d1
+ _set_timer(&pmlmepriv->assoc_timer, 1);
+ }
+ else if(pcmd->res != H2C_SUCCESS)
-+ {
++ {
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("********Error:rtw_select_and_join_from_scanned_queue Wait Sema Fail ************\n"));
-+ _set_timer(&pmlmepriv->assoc_timer, 1);
++ _set_timer(&pmlmepriv->assoc_timer, 1);
+ }
-+
++
+ rtw_free_cmd_obj(pcmd);
-+
-+_func_exit_;
++
++_func_exit_;
+}
+
+void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd)
-+{
++{
+ _irqL irqL;
+ u8 timer_cancelled;
+ struct sta_info *psta = NULL;
-+ struct wlan_network *pwlan = NULL;
-+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
++ struct wlan_network *pwlan = NULL;
++ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)pcmd->parmbuf;
+ struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
+
-+_func_enter_;
++_func_enter_;
+
+ if((pcmd->res != H2C_SUCCESS))
-+ {
++ {
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ********Error: rtw_createbss_cmd_callback Fail ************\n\n."));
-+ _set_timer(&pmlmepriv->assoc_timer, 1 );
++ _set_timer(&pmlmepriv->assoc_timer, 1 );
+ }
-+
++
+ _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled);
+
+#ifdef CONFIG_FW_MLMLE
+ //endian_convert
+ pnetwork->Length = le32_to_cpu(pnetwork->Length);
-+ pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength);
++ pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength);
+ pnetwork->Privacy =le32_to_cpu(pnetwork->Privacy);
+ pnetwork->Rssi = le32_to_cpu(pnetwork->Rssi);
-+ pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse);
++ pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse);
+ pnetwork->Configuration.ATIMWindow = le32_to_cpu(pnetwork->Configuration.ATIMWindow);
+ //pnetwork->Configuration.BeaconPeriod = le32_to_cpu(pnetwork->Configuration.BeaconPeriod);
+ pnetwork->Configuration.DSConfig =le32_to_cpu(pnetwork->Configuration.DSConfig);
+ pnetwork->Configuration.FHConfig.DwellTime=le32_to_cpu(pnetwork->Configuration.FHConfig.DwellTime);
+ pnetwork->Configuration.FHConfig.HopPattern=le32_to_cpu(pnetwork->Configuration.FHConfig.HopPattern);
+ pnetwork->Configuration.FHConfig.HopSet=le32_to_cpu(pnetwork->Configuration.FHConfig.HopSet);
-+ pnetwork->Configuration.FHConfig.Length=le32_to_cpu(pnetwork->Configuration.FHConfig.Length);
++ pnetwork->Configuration.FHConfig.Length=le32_to_cpu(pnetwork->Configuration.FHConfig.Length);
+ pnetwork->Configuration.Length = le32_to_cpu(pnetwork->Configuration.Length);
+ pnetwork->InfrastructureMode = le32_to_cpu(pnetwork->InfrastructureMode);
+ pnetwork->IELength = le32_to_cpu(pnetwork->IELength);
+#endif
-+
++
+ _enter_critical_bh(&pmlmepriv->lock, &irqL);
-+
-+
++
++
+ if(check_fwstate(pmlmepriv, WIFI_AP_STATE) )
+ {
+ psta = rtw_get_stainfo(&padapter->stapriv, pnetwork->MacAddress);
+ if(!psta)
+ {
+ psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress);
-+ if (psta == NULL)
-+ {
++ if (psta == NULL)
++ {
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nCan't alloc sta_info when createbss_cmd_callback\n"));
+ goto createbss_cmd_fail ;
+ }
-+ }
-+
++ }
++
+ rtw_indicate_connect( padapter);
+ }
+ else
-+ {
++ {
+ _irqL irqL;
+
+ pwlan = _rtw_alloc_network(pmlmepriv);
@@ -9576,13 +9571,13 @@ index 000000000000..f906eb3489d1
+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
+ goto createbss_cmd_fail;
+ }
-+ pwlan->last_scanned = rtw_get_current_time();
-+ }
++ pwlan->last_scanned = rtw_get_current_time();
++ }
+ else
+ {
+ rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
+ }
-+
++
+ pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork);
+ _rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
+ //pwlan->fixed = _TRUE;
@@ -9597,7 +9592,7 @@ index 000000000000..f906eb3489d1
+
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
+
-+#if 0
++#if 0
+ if((pmlmepriv->fw_state) & WIFI_AP_STATE)
+ {
+ psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress);
@@ -9606,26 +9601,26 @@ index 000000000000..f906eb3489d1
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nCan't alloc sta_info when createbss_cmd_callback\n"));
+ goto createbss_cmd_fail ;
+ }
-+
++
+ rtw_indicate_connect( padapter);
+ }
+ else {
+
+ //rtw_indicate_disconnect(dev);
-+ }
++ }
+#endif
+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
+ // we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback)
-+
++
+ }
+
+createbss_cmd_fail:
-+
++
+ _exit_critical_bh(&pmlmepriv->lock, &irqL);
+
+ rtw_free_cmd_obj(pcmd);
-+
-+_func_exit_;
++
++_func_exit_;
+
+}
+
@@ -9633,85 +9628,84 @@ index 000000000000..f906eb3489d1
+
+void rtw_setstaKey_cmdrsp_callback(_adapter* padapter , struct cmd_obj *pcmd)
+{
-+
++
+ struct sta_priv * pstapriv = &padapter->stapriv;
+ struct set_stakey_rsp* psetstakey_rsp = (struct set_stakey_rsp*) (pcmd->rsp);
+ struct sta_info* psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);
+
-+_func_enter_;
++_func_enter_;
+
+ if(psta==NULL)
+ {
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info \n\n"));
+ goto exit;
+ }
-+
++
+ //psta->aid = psta->mac_id = psetstakey_rsp->keyid; //CAM_ID(CAM_ENTRY)
-+
-+exit:
++
++exit:
+
+ rtw_free_cmd_obj(pcmd);
-+
-+_func_exit_;
++
++_func_exit_;
+
+}
+void rtw_setassocsta_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
+{
+ _irqL irqL;
+ struct sta_priv * pstapriv = &padapter->stapriv;
-+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
++ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ struct set_assocsta_parm* passocsta_parm = (struct set_assocsta_parm*)(pcmd->parmbuf);
-+ struct set_assocsta_rsp* passocsta_rsp = (struct set_assocsta_rsp*) (pcmd->rsp);
++ struct set_assocsta_rsp* passocsta_rsp = (struct set_assocsta_rsp*) (pcmd->rsp);
+ struct sta_info* psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);
+
-+_func_enter_;
-+
++_func_enter_;
++
+ if(psta==NULL)
+ {
+ RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info \n\n"));
+ goto exit;
+ }
-+
++
+ psta->aid = psta->mac_id = passocsta_rsp->cam_id;
+
+ _enter_critical_bh(&pmlmepriv->lock, &irqL);
+
-+ if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE))
++ if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE))
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
+
-+ set_fwstate(pmlmepriv, _FW_LINKED);
++ set_fwstate(pmlmepriv, _FW_LINKED);
+ _exit_critical_bh(&pmlmepriv->lock, &irqL);
+
-+exit:
++exit:
+ rtw_free_cmd_obj(pcmd);
+
-+_func_exit_;
++_func_exit_;
+}
+
+void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd);
+void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
+{
-+_func_enter_;
-+
++_func_enter_;
++
+ rtw_free_cmd_obj(pcmd);
+#ifdef CONFIG_MP_INCLUDED
+ padapter->mppriv.workparam.bcompleted=_TRUE;
+#endif
+
-+_func_exit_;
++_func_exit_;
+
+}
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c
new file mode 100755
-index 000000000000..f70fcb7b2cd1
+index 000000000000..2268c1aafd86
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c
-@@ -0,0 +1,1337 @@
+@@ -0,0 +1,1336 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -9778,11 +9772,11 @@ index 000000000000..f70fcb7b2cd1
+ int *eof, void *data)
+{
+ struct net_device *dev = data;
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len, "%s\n", DRIVERVERSION);
-+
++
+ *eof = 1;
+ return len;
+}
@@ -9794,7 +9788,7 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len,
@@ -9817,7 +9811,7 @@ index 000000000000..f70fcb7b2cd1
+ if (count < 1)
+ return -EFAULT;
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%d ", &is_signal_dbg);
+
@@ -9827,16 +9821,16 @@ index 000000000000..f70fcb7b2cd1
+ printk("%d\n", GlobalDebugLevel);
+ }
+ }
-+
++
+ return count;
-+
++
+}
+
+#ifdef DBG_MEM_ALLOC
+int proc_get_mstat(char *page, char **start,
+ off_t offset, int count,
+ int *eof, void *data)
-+{
++{
+ int len = 0;
+
+ len += _rtw_mstat_dump(page+len, count-len);
@@ -9866,9 +9860,9 @@ index 000000000000..f70fcb7b2cd1
+ {
+ DBG_871X("argument size is less than 3\n");
+ return -EFAULT;
-+ }
++ }
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%x %x %x", &addr, &val, &len);
+
@@ -9880,23 +9874,23 @@ index 000000000000..f70fcb7b2cd1
+ switch(len)
+ {
+ case 1:
-+ rtw_write8(padapter, addr, (u8)val);
++ rtw_write8(padapter, addr, (u8)val);
+ break;
+ case 2:
-+ rtw_write16(padapter, addr, (u16)val);
++ rtw_write16(padapter, addr, (u16)val);
+ break;
+ case 4:
-+ rtw_write32(padapter, addr, val);
++ rtw_write32(padapter, addr, val);
+ break;
+ default:
+ DBG_871X("error write length=%d", len);
+ break;
-+ }
-+
++ }
++
+ }
-+
++
+ return count;
-+
++
+}
+
+static u32 proc_get_read_addr=0xeeeeeeee;
@@ -9905,21 +9899,21 @@ index 000000000000..f70fcb7b2cd1
+int proc_get_read_reg(char *page, char **start,
+ off_t offset, int count,
+ int *eof, void *data)
-+{
++{
+ struct net_device *dev = data;
-+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+
++ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
++
+ int len = 0;
+
+ if(proc_get_read_addr==0xeeeeeeee)
+ {
+ *eof = 1;
+ return len;
-+ }
++ }
+
+ switch(proc_get_read_len)
+ {
-+ case 1:
++ case 1:
+ len += snprintf(page + len, count - len, "rtw_read8(0x%x)=0x%x\n", proc_get_read_addr, rtw_read8(padapter, proc_get_read_addr));
+ break;
+ case 2:
@@ -9948,9 +9942,9 @@ index 000000000000..f70fcb7b2cd1
+ {
+ DBG_871X("argument size is less than 2\n");
+ return -EFAULT;
-+ }
++ }
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%x %x", &addr, &len);
+
@@ -9960,10 +9954,10 @@ index 000000000000..f70fcb7b2cd1
+ }
+
+ proc_get_read_addr = addr;
-+
++
+ proc_get_read_len = len;
+ }
-+
++
+ return count;
+
+}
@@ -9975,11 +9969,11 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len, "fwstate=0x%x\n", get_fwstate(pmlmepriv));
-+
++
+ *eof = 1;
+ return len;
+}
@@ -9989,15 +9983,15 @@ index 000000000000..f70fcb7b2cd1
+ int *eof, void *data)
+{
+ struct net_device *dev = data;
-+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
++ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
-+
++
+ int len = 0;
+
-+ len += snprintf(page + len, count - len, "auth_alg=0x%x, enc_alg=0x%x, auth_type=0x%x, enc_type=0x%x\n",
++ len += snprintf(page + len, count - len, "auth_alg=0x%x, enc_alg=0x%x, auth_type=0x%x, enc_type=0x%x\n",
+ psecuritypriv->dot11AuthAlgrthm, psecuritypriv->dot11PrivacyAlgrthm,
+ psecuritypriv->ndisauthtype, psecuritypriv->ndisencryptstatus);
-+
++
+ *eof = 1;
+ return len;
+}
@@ -10007,14 +10001,14 @@ index 000000000000..f70fcb7b2cd1
+ int *eof, void *data)
+{
+ struct net_device *dev = data;
-+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
++ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len, "pmlmeinfo->state=0x%x\n", pmlmeinfo->state);
-+
++
+ *eof = 1;
+ return len;
+}
@@ -10026,11 +10020,11 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len, "qos_option=%d\n", pmlmepriv->qospriv.qos_option);
-+
++
+ *eof = 1;
+ return len;
+
@@ -10043,11 +10037,11 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len, "ht_option=%d\n", pmlmepriv->htpriv.ht_option);
-+
++
+ *eof = 1;
+ return len;
+}
@@ -10088,29 +10082,29 @@ index 000000000000..f70fcb7b2cd1
+ {
+ int i;
+ struct recv_reorder_ctrl *preorder_ctrl;
-+
-+ len += snprintf(page + len, count - len, "SSID=%s\n", cur_network->network.Ssid.Ssid);
++
++ len += snprintf(page + len, count - len, "SSID=%s\n", cur_network->network.Ssid.Ssid);
+ len += snprintf(page + len, count - len, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
-+ len += snprintf(page + len, count - len, "cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);
++ len += snprintf(page + len, count - len, "cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);
+ len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
-+ len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
-+ len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
-+ len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);
-+ len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
++ len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
++ len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
++ len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);
++ len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
+ len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
-+
++
+ for(i=0;i<16;i++)
-+ {
++ {
+ preorder_ctrl = &psta->recvreorder_ctrl[i];
+ if(preorder_ctrl->enable)
+ {
+ len += snprintf(page + len, count - len, "tid=%d, indicate_seq=%d\n", i, preorder_ctrl->indicate_seq);
+ }
-+ }
-+
++ }
++
+ }
+ else
-+ {
++ {
+ len += snprintf(page + len, count - len, "can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n", MAC_ARG(cur_network->network.MacAddress));
+ }
+
@@ -10126,15 +10120,15 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ int len = 0;
-+
-+ len += snprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n",
++
++ len += snprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n",
+ padapter->bSurpriseRemoved, padapter->bDriverStopped);
+
+ *eof = 1;
+ return len;
+
+}
-+
++
+int proc_get_trx_info(char *page, char **start,
+ off_t offset, int count,
+ int *eof, void *data)
@@ -10147,7 +10141,7 @@ index 000000000000..f70fcb7b2cd1
+ struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
+ struct hw_xmit *phwxmit;
+ int len = 0;
-+
++
+ len += snprintf(page + len, count - len, "free_xmitbuf_cnt=%d, free_xmitframe_cnt=%d"
+ ", free_ext_xmitbuf_cnt=%d, free_xframe_ext_cnt=%d"
+ ", free_recvframe_cnt=%d\n",
@@ -10167,7 +10161,7 @@ index 000000000000..f70fcb7b2cd1
+ len += snprintf(page + len, count - len, "continual_urb_error=%d\n", atomic_read(&pdvobj->continual_urb_error));
+#endif
+
-+ for(i = 0; i < 4; i++)
++ for(i = 0; i < 4; i++)
+ {
+ phwxmit = pxmitpriv->hwxmits + i;
+ len += snprintf(page + len, count - len, "%d, hwq.accnt=%d\n", i, phwxmit->accnt);
@@ -10177,8 +10171,8 @@ index 000000000000..f70fcb7b2cd1
+ return len;
+
+}
-+
-+
++
++
+
+int proc_get_mac_reg_dump1(char *page, char **start,
+ off_t offset, int count,
@@ -10192,10 +10186,10 @@ index 000000000000..f70fcb7b2cd1
+ len += snprintf(page + len, count - len, "\n======= MAC REG =======\n");
+
+ for(i=0x0;i<0x300;i+=4)
-+ {
++ {
+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
-+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
-+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
++ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
++ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
+ }
+
+ *eof = 1;
@@ -10215,12 +10209,12 @@ index 000000000000..f70fcb7b2cd1
+ len += snprintf(page + len, count - len, "\n======= MAC REG =======\n");
+ memset(page, 0, count);
+ for(i=0x300;i<0x600;i+=4)
-+ {
++ {
+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
-+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
-+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
++ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
++ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
+ }
-+
++
+ *eof = 1;
+ return len;
+
@@ -10238,10 +10232,10 @@ index 000000000000..f70fcb7b2cd1
+ len += snprintf(page + len, count - len, "\n======= MAC REG =======\n");
+
+ for(i=0x600;i<0x800;i+=4)
-+ {
++ {
+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
-+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
-+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
++ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
++ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
+ }
+
+ *eof = 1;
@@ -10254,19 +10248,19 @@ index 000000000000..f70fcb7b2cd1
+ int *eof, void *data)
+{
+ struct net_device *dev = data;
-+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
++ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ int len = 0;
-+ int i,j=1;
++ int i,j=1;
+
-+ len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
++ len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
+ for(i=0x800;i<0xB00;i+=4)
+ {
-+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
-+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
-+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
++ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
++ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
++ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
+ }
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+int proc_get_bb_reg_dump2(char *page, char **start,
@@ -10274,19 +10268,19 @@ index 000000000000..f70fcb7b2cd1
+ int *eof, void *data)
+{
+ struct net_device *dev = data;
-+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
++ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ int len = 0;
-+ int i,j=1;
++ int i,j=1;
+
-+ len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
++ len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
+ for(i=0xB00;i<0xE00;i+=4)
+ {
-+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
-+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
-+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
++ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
++ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
++ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
+ }
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+int proc_get_bb_reg_dump3(char *page, char **start,
@@ -10294,19 +10288,19 @@ index 000000000000..f70fcb7b2cd1
+ int *eof, void *data)
+{
+ struct net_device *dev = data;
-+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
++ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ int len = 0;
-+ int i,j=1;
++ int i,j=1;
+
-+ len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
++ len += snprintf(page + len, count - len, "\n======= BB REG =======\n");
+ for(i=0xE00;i<0x1000;i+=4)
+ {
-+ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
-+ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
-+ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
++ if(j%4==1) len += snprintf(page + len, count - len,"0x%02x",i);
++ len += snprintf(page + len, count - len," 0x%08x ",rtw_read32(padapter,i));
++ if((j++)%4 == 0) len += snprintf(page + len, count - len,"\n");
+ }
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+int proc_get_rf_reg_dump1(char *page, char **start,
@@ -10318,21 +10312,21 @@ index 000000000000..f70fcb7b2cd1
+ int len = 0;
+ int i,j=1,path;
+ u32 value;
-+
++
+ len += snprintf(page + len, count - len, "\n======= RF REG =======\n");
+ path = 1;
+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path);
+ for(i=0;i<0xC0;i++)
-+ {
++ {
+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord);
+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i);
+ len += snprintf(page + len, count - len, " 0x%08x ",value);
-+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n");
++ if((j++)%4==0) len += snprintf(page + len, count - len, "\n");
+ }
+
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+
@@ -10344,21 +10338,21 @@ index 000000000000..f70fcb7b2cd1
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ int len = 0;
+ int i,j=1,path;
-+ u32 value;
++ u32 value;
+
-+ len += snprintf(page + len, count - len, "\n======= RF REG =======\n");
++ len += snprintf(page + len, count - len, "\n======= RF REG =======\n");
+ path = 1;
+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path);
+ for(i=0xC0;i<0x100;i++)
-+ {
++ {
+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord);
+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i);
+ len += snprintf(page + len, count - len, " 0x%08x ",value);
-+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n");
++ if((j++)%4==0) len += snprintf(page + len, count - len, "\n");
+ }
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+
@@ -10370,22 +10364,22 @@ index 000000000000..f70fcb7b2cd1
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ int len = 0;
+ int i,j=1,path;
-+ u32 value;
++ u32 value;
+
+ len += snprintf(page + len, count - len, "\n======= RF REG =======\n");
+ path = 2;
+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path);
+ for(i=0;i<0xC0;i++)
-+ {
++ {
+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord);
+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i);
+ len += snprintf(page + len, count - len, " 0x%08x ",value);
-+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n");
++ if((j++)%4==0) len += snprintf(page + len, count - len, "\n");
+ }
+
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+
@@ -10403,7 +10397,7 @@ index 000000000000..f70fcb7b2cd1
+ path = 2;
+ len += snprintf(page + len, count - len, "\nRF_Path(%x)\n",path);
+ for(i=0xC0;i<0x100;i++)
-+ {
++ {
+ //value = PHY_QueryRFReg(padapter, (RF90_RADIO_PATH_E)path,i, bMaskDWord);
+ value =rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);
+ if(j%4==1) len += snprintf(page + len, count - len, "0x%02x ",i);
@@ -10411,11 +10405,11 @@ index 000000000000..f70fcb7b2cd1
+ if((j++)%4==0) len += snprintf(page + len, count - len, "\n");
+ }
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+
-+
++
+int proc_get_rx_signal(char *page, char **start,
+ off_t offset, int count,
+ int *eof, void *data)
@@ -10423,7 +10417,7 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len,
@@ -10431,14 +10425,14 @@ index 000000000000..f70fcb7b2cd1
+ "rxpwdb:%d\n"
+ "signal_strength:%u\n"
+ "signal_qual:%u\n"
-+ "noise:%u\n",
++ "noise:%u\n",
+ padapter->recvpriv.rssi,
+ padapter->recvpriv.rxpwdb,
+ padapter->recvpriv.signal_strength,
+ padapter->recvpriv.signal_qual,
+ padapter->recvpriv.noise
+ );
-+
++
+ *eof = 1;
+ return len;
+}
@@ -10454,15 +10448,15 @@ index 000000000000..f70fcb7b2cd1
+ if (count < 1)
+ return -EFAULT;
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%u %u", &is_signal_dbg, &signal_strength);
+
+ is_signal_dbg = is_signal_dbg==0?0:1;
-+
++
+ if(is_signal_dbg && num!=2)
+ return count;
-+
++
+ signal_strength = signal_strength>100?100:signal_strength;
+ signal_strength = signal_strength<0?0:signal_strength;
+
@@ -10473,11 +10467,11 @@ index 000000000000..f70fcb7b2cd1
+ DBG_871X("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength);
+ else
+ DBG_871X("set %s\n", "HW_SIGNAL_STRENGTH");
-+
++
+ }
-+
++
+ return count;
-+
++
+}
+
+int proc_get_ht_enable(char *page, char **start,
@@ -10487,9 +10481,9 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct registry_priv *pregpriv = &padapter->registrypriv;
-+
++
+ int len = 0;
-+
++
+ if(pregpriv)
+ len += snprintf(page + len, count - len,
+ "%d\n",
@@ -10512,7 +10506,7 @@ index 000000000000..f70fcb7b2cd1
+ if (count < 1)
+ return -EFAULT;
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%d ", &mode);
+
@@ -10522,9 +10516,9 @@ index 000000000000..f70fcb7b2cd1
+ printk("ht_enable=%d\n", pregpriv->ht_enable);
+ }
+ }
-+
++
+ return count;
-+
++
+}
+
+
@@ -10535,9 +10529,9 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct registry_priv *pregpriv = &padapter->registrypriv;
-+
++
+ int len = 0;
-+
++
+ if(pregpriv)
+ len += snprintf(page + len, count - len,
+ "%d\n",
@@ -10560,7 +10554,7 @@ index 000000000000..f70fcb7b2cd1
+ if (count < 1)
+ return -EFAULT;
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%d ", &mode);
+
@@ -10570,9 +10564,9 @@ index 000000000000..f70fcb7b2cd1
+ printk("cbw40_enable=%d\n", mode);
+ }
+ }
-+
++
+ return count;
-+
++
+}
+
+int proc_get_ampdu_enable(char *page, char **start,
@@ -10582,9 +10576,9 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct registry_priv *pregpriv = &padapter->registrypriv;
-+
++
+ int len = 0;
-+
++
+ if(pregpriv)
+ len += snprintf(page + len, count - len,
+ "%d\n",
@@ -10607,7 +10601,7 @@ index 000000000000..f70fcb7b2cd1
+ if (count < 1)
+ return -EFAULT;
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%d ", &mode);
+
@@ -10617,9 +10611,9 @@ index 000000000000..f70fcb7b2cd1
+ printk("ampdu_enable=%d\n", mode);
+ }
+ }
-+
++
+ return count;
-+
++
+}
+
+
@@ -10629,9 +10623,9 @@ index 000000000000..f70fcb7b2cd1
+{
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+
++
+ int len = 0;
-+
++
+ if(padapter)
+ len += snprintf(page + len, count - len,
+ "%d %d\n",
@@ -10650,9 +10644,9 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct registry_priv *pregpriv = &padapter->registrypriv;
-+
++
+ int len = 0;
-+
++
+ if(pregpriv)
+ len += snprintf(page + len, count - len,
+ "%d\n",
@@ -10675,7 +10669,7 @@ index 000000000000..f70fcb7b2cd1
+ if (count < 1)
+ return -EFAULT;
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%d ", &mode);
+
@@ -10685,9 +10679,9 @@ index 000000000000..f70fcb7b2cd1
+ printk("rx_stbc=%d\n", mode);
+ }
+ }
-+
++
+ return count;
-+
++
+}
+
+int proc_get_vid(char *page, char **start,
@@ -10699,14 +10693,14 @@ index 000000000000..f70fcb7b2cd1
+ u16 VID=0;
+ int len = 0;
+
-+ rtw_hal_get_hwreg(padapter, HW_VAR_VID, (u8 *)&VID);
++ rtw_hal_get_hwreg(padapter, HW_VAR_VID, (u8 *)&VID);
+ len += snprintf(page + len, count - len,
+ "%04x\n",
+ VID
+ );
+
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+int proc_get_pid(char *page, char **start,
@@ -10715,17 +10709,17 @@ index 000000000000..f70fcb7b2cd1
+{
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+ u16 PID=0;
++ u16 PID=0;
+ int len = 0;
+
-+ rtw_hal_get_hwreg(padapter, HW_VAR_PID, (u8 *)&PID);
++ rtw_hal_get_hwreg(padapter, HW_VAR_PID, (u8 *)&PID);
+ len += snprintf(page + len, count - len,
+ "%04x\n",
+ PID
+ );
+
+ *eof = 1;
-+ return len;
++ return len;
+}
+
+int proc_get_rssi_disp(char *page, char **start,
@@ -10748,9 +10742,9 @@ index 000000000000..f70fcb7b2cd1
+ {
+ DBG_8192C("argument size is less than 1\n");
+ return -EFAULT;
-+ }
++ }
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%x", &enable);
+
@@ -10758,25 +10752,25 @@ index 000000000000..f70fcb7b2cd1
+ DBG_8192C("invalid set_rssi_disp parameter!\n");
+ return count;
+ }
-+
++
+ if(enable)
-+ {
++ {
+ DBG_8192C("Turn On Rx RSSI Display Function\n");
-+ padapter->bRxRSSIDisplay = enable ;
++ padapter->bRxRSSIDisplay = enable ;
+ }
+ else
+ {
+ DBG_8192C("Turn Off Rx RSSI Display Function\n");
+ padapter->bRxRSSIDisplay = 0 ;
+ }
-+
++
+ }
-+
++
+ return count;
-+
-+}
+
-+
++}
++
++
+#ifdef CONFIG_AP_MODE
+
+int proc_get_all_sta_info(char *page, char **start,
@@ -10791,18 +10785,18 @@ index 000000000000..f70fcb7b2cd1
+ int i, j;
+ _list *plist, *phead;
+ struct recv_reorder_ctrl *preorder_ctrl;
-+ int len = 0;
-+
++ int len = 0;
++
+
+ len += snprintf(page + len, count - len, "sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap);
-+
++
+ _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
+
+ for(i=0; i< NUM_STA; i++)
+ {
+ phead = &(pstapriv->sta_hash[i]);
+ plist = get_next(phead);
-+
++
+ while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
+ {
+ psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
@@ -10813,10 +10807,10 @@ index 000000000000..f70fcb7b2cd1
+ {
+ len += snprintf(page + len, count - len, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
+ len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
-+ len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
-+ len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
-+ len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);
-+ len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
++ len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
++ len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);
++ len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);
++ len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);
+ len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
+ len += snprintf(page + len, count - len, "sleepq_len=%d\n", psta->sleepq_len);
+ len += snprintf(page + len, count - len, "capability=0x%x\n", psta->capability);
@@ -10826,30 +10820,30 @@ index 000000000000..f70fcb7b2cd1
+ len += snprintf(page + len, count - len, "wpa2_pairwise_cipher=0x%x\n", psta->wpa2_pairwise_cipher);
+ len += snprintf(page + len, count - len, "qos_info=0x%x\n", psta->qos_info);
+ len += snprintf(page + len, count - len, "dot118021XPrivacy=0x%x\n", psta->dot118021XPrivacy);
-+
++
+ for(j=0;j<16;j++)
-+ {
++ {
+ preorder_ctrl = &psta->recvreorder_ctrl[j];
+ if(preorder_ctrl->enable)
+ {
+ len += snprintf(page + len, count - len, "tid=%d, indicate_seq=%d\n", j, preorder_ctrl->indicate_seq);
+ }
-+ }
-+
-+ }
-+
++ }
++
++ }
++
+ }
-+
++
+ }
-+
++
+ _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL);
+
+ *eof = 1;
+ return len;
+
+}
-+
-+#endif
++
++#endif
+
+#ifdef DBG_MEMORY_LEAK
+#include <asm/atomic.h>
@@ -10860,12 +10854,12 @@ index 000000000000..f70fcb7b2cd1
+ off_t offset, int count,
+ int *eof, void *data)
+{
-+
++
+ int len = 0;
+
+ len += snprintf(page + len, count - len, "_malloc_cnt=%d\n", atomic_read(&_malloc_cnt));
+ len += snprintf(page + len, count - len, "_malloc_size=%d\n", atomic_read(&_malloc_size));
-+
++
+ *eof = 1;
+ return len;
+}
@@ -10887,8 +10881,8 @@ index 000000000000..f70fcb7b2cd1
+ index_24G = i;
+ if ( pmlmeext->channel_set[i].ChannelNum == 36)
+ index_5G = i;
-+ }
-+
++ }
++
+ for (i=0; pmlmeext->channel_set[i].ChannelNum !=0; i++) {
+ // 2.4G
+ if ( pmlmeext->channel_set[i].ChannelNum == 6 ) {
@@ -10919,11 +10913,11 @@ index 000000000000..f70fcb7b2cd1
+ }
+ }
+#if 1 // debug
-+ len += snprintf(page + len, count - len, "The rx cnt of channel %3d = %d\n",
++ len += snprintf(page + len, count - len, "The rx cnt of channel %3d = %d\n",
+ pmlmeext->channel_set[i].ChannelNum, pmlmeext->channel_set[i].rx_count);
+#endif
+ }
-+
++
+ len += snprintf(page + len, count - len, "best_channel_5G = %d\n", best_channel_5G);
+ len += snprintf(page + len, count - len, "best_channel_24G = %d\n", best_channel_24G);
+
@@ -10965,9 +10959,9 @@ index 000000000000..f70fcb7b2cd1
+ struct net_device *dev = data;
+ _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+
++
+ int len = 0;
-+
++
+ *eof = 1;
+ return len;
+}
@@ -10982,7 +10976,7 @@ index 000000000000..f70fcb7b2cd1
+ if (count < 1)
+ return -EFAULT;
+
-+ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
++ if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
+
+ int num = sscanf(tmp, "%d", &trigger_point);
+
@@ -10991,9 +10985,9 @@ index 000000000000..f70fcb7b2cd1
+ else
+ sreset_set_trigger_point(padapter, trigger_point);
+ }
-+ -+
++++
+ return count;
-+
++++
+} +}
+#endif /* DBG_CONFIG_ERROR_DETECT */
+
@@ -11038,23 +11032,22 @@ index 000000000000..f70fcb7b2cd1
+
+ dm_adaptivity_set_parm(padapter, (s8)TH_L2H_ini, TH_EDCCA_HL_diff, (s8)IGI_Base, (bool)ForceEDCCA, AdapEn_RSSI, IGI_LowerBound);
+ }
-+
++
+ return count;
+}
+#endif /* CONFIG_DM_ADAPTIVITY */
+
+#endif
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c
new file mode 100755
-index 000000000000..fd07d64d8724
+index 000000000000..c0a6b541bf12
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c
-@@ -0,0 +1,423 @@
+@@ -0,0 +1,422 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -11084,7 +11077,7 @@ index 000000000000..fd07d64d8724
+ rtw_udelay_os(CLOCK_RATE);
+
+_func_exit_;
-+
++
+}
+
+void down_clk(_adapter * padapter, u16 *x )
@@ -11093,7 +11086,7 @@ index 000000000000..fd07d64d8724
+ *x = *x & ~_EESK;
+ rtw_write8(padapter, EE_9346CR, (u8)*x);
+ rtw_udelay_os(CLOCK_RATE);
-+_func_exit_;
++_func_exit_;
+}
+
+void shift_out_bits(_adapter * padapter, u16 data, u16 count)
@@ -11131,14 +11124,14 @@ index 000000000000..fd07d64d8724
+ }
+ x &= ~_EEDI;
+ rtw_write8(padapter, EE_9346CR, (u8)x);
-+out:
-+_func_exit_;
++out:
++_func_exit_;
+}
+
+u16 shift_in_bits (_adapter * padapter)
+{
+ u16 x,d=0,i;
-+_func_enter_;
++_func_enter_;
+ if(padapter->bSurpriseRemoved==_TRUE){
+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE"));
+ goto out;
@@ -11164,8 +11157,8 @@ index 000000000000..fd07d64d8724
+
+ down_clk(padapter, &x);
+ }
-+out:
-+_func_exit_;
++out:
++_func_exit_;
+
+ return d;
+}
@@ -11173,7 +11166,7 @@ index 000000000000..fd07d64d8724
+void standby(_adapter * padapter )
+{
+ u8 x;
-+_func_enter_;
++_func_enter_;
+ x = rtw_read8(padapter, EE_9346CR);
+
+ x &= ~(_EECS | _EESK);
@@ -11183,16 +11176,16 @@ index 000000000000..fd07d64d8724
+ x |= _EECS;
+ rtw_write8(padapter, EE_9346CR, x);
+ rtw_udelay_os(CLOCK_RATE);
-+_func_exit_;
++_func_exit_;
+}
+
+u16 wait_eeprom_cmd_done(_adapter* padapter)
+{
+ u8 x;
+ u16 i,res=_FALSE;
-+_func_enter_;
++_func_enter_;
+ standby(padapter );
-+ for (i=0; i<200; i++)
++ for (i=0; i<200; i++)
+ {
+ x = rtw_read8(padapter, EE_9346CR);
+ if (x & _EEDO){
@@ -11201,15 +11194,15 @@ index 000000000000..fd07d64d8724
+ }
+ rtw_udelay_os(CLOCK_RATE);
+ }
-+exit:
-+_func_exit_;
++exit:
++_func_exit_;
+ return res;
+}
+
+void eeprom_clean(_adapter * padapter)
+{
+ u16 x;
-+_func_enter_;
++_func_enter_;
+ if(padapter->bSurpriseRemoved==_TRUE){
+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE"));
+ goto out;
@@ -11231,8 +11224,8 @@ index 000000000000..fd07d64d8724
+ goto out;
+ }
+ down_clk(padapter, &x);
-+out:
-+_func_exit_;
++out:
++_func_exit_;
+}
+
+void eeprom_write16(_adapter * padapter, u16 reg, u16 data)
@@ -11242,7 +11235,7 @@ index 000000000000..fd07d64d8724
+ u8 tmp8_ori,tmp8_new,tmp8_clk_ori,tmp8_clk_new;
+ tmp8_ori=rtw_read8(padapter, 0x102502f1);
+ tmp8_new=tmp8_ori & 0xf7;
-+ if(tmp8_ori != tmp8_new){
++ if(tmp8_ori != tmp8_new){
+ rtw_write8(padapter, 0x102502f1, tmp8_new);
+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n"));
+ }
@@ -11251,10 +11244,10 @@ index 000000000000..fd07d64d8724
+ if(tmp8_clk_new!=tmp8_clk_ori){
+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n"));
+ rtw_write8(padapter, 0x10250003, tmp8_clk_new);
-+ }
++ }
+#endif
-+_func_enter_;
-+
++_func_enter_;
++
+ x = rtw_read8(padapter, EE_9346CR);
+
+ x &= ~(_EEDI | _EEDO | _EESK | _EEM0);
@@ -11262,12 +11255,12 @@ index 000000000000..fd07d64d8724
+ rtw_write8(padapter, EE_9346CR, x);
+
+ shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5);
-+
++
+ if(padapter->EepromAddressSize==8) //CF+ and SDIO
+ shift_out_bits(padapter, 0, 6);
+ else //USB
+ shift_out_bits(padapter, 0, 4);
-+
++
+ standby( padapter);
+
+// Commented out by rcnjko, 2004.0
@@ -11276,7 +11269,7 @@ index 000000000000..fd07d64d8724
+// shift_out_bits(Adapter, EEPROM_ERASE_OPCODE, 3);
+// shift_out_bits(Adapter, reg, Adapter->EepromAddressSize);
+//
-+// if (wait_eeprom_cmd_done(Adapter ) == FALSE)
++// if (wait_eeprom_cmd_done(Adapter ) == FALSE)
+// {
+// return;
+// }
@@ -11295,7 +11288,7 @@ index 000000000000..fd07d64d8724
+ // write the data to the selected EEPROM word.
+ shift_out_bits(padapter, data, 16);
+
-+ if (wait_eeprom_cmd_done(padapter ) == _FALSE)
++ if (wait_eeprom_cmd_done(padapter ) == _FALSE)
+ {
+
+ goto exit;
@@ -11307,7 +11300,7 @@ index 000000000000..fd07d64d8724
+ shift_out_bits(padapter, reg, 4);
+
+ eeprom_clean(padapter );
-+exit:
++exit:
+#ifdef CONFIG_RTL8712
+ if(tmp8_clk_new!=tmp8_clk_ori)
+ rtw_write8(padapter, 0x10250003, tmp8_clk_ori);
@@ -11315,7 +11308,7 @@ index 000000000000..fd07d64d8724
+ rtw_write8(padapter, 0x102502f1, tmp8_ori);
+
+#endif
-+_func_exit_;
++_func_exit_;
+ return;
+}
+
@@ -11328,7 +11321,7 @@ index 000000000000..fd07d64d8724
+ u8 tmp8_ori,tmp8_new,tmp8_clk_ori,tmp8_clk_new;
+ tmp8_ori= rtw_read8(padapter, 0x102502f1);
+ tmp8_new = tmp8_ori & 0xf7;
-+ if(tmp8_ori != tmp8_new){
++ if(tmp8_ori != tmp8_new){
+ rtw_write8(padapter, 0x102502f1, tmp8_new);
+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x102502f1=====\n"));
+ }
@@ -11337,9 +11330,9 @@ index 000000000000..fd07d64d8724
+ if(tmp8_clk_new!=tmp8_clk_ori){
+ RT_TRACE(_module_rtl871x_mp_ioctl_c_,_drv_err_,("====write 0x10250003=====\n"));
+ rtw_write8(padapter, 0x10250003, tmp8_clk_new);
-+ }
++ }
+#endif
-+_func_enter_;
++_func_enter_;
+
+ if(padapter->bSurpriseRemoved==_TRUE){
+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE"));
@@ -11366,7 +11359,7 @@ index 000000000000..fd07d64d8724
+ data = shift_in_bits(padapter);
+
+ eeprom_clean(padapter);
-+out:
++out:
+#ifdef CONFIG_RTL8712
+ if(tmp8_clk_new!=tmp8_clk_ori)
+ rtw_write8(padapter, 0x10250003, tmp8_clk_ori);
@@ -11374,7 +11367,7 @@ index 000000000000..fd07d64d8724
+ rtw_write8(padapter, 0x102502f1, tmp8_ori);
+
+#endif
-+_func_exit_;
++_func_exit_;
+ return data;
+
+
@@ -11384,12 +11377,12 @@ index 000000000000..fd07d64d8724
+
+
+//From even offset
-+void eeprom_read_sz(_adapter * padapter, u16 reg, u8* data, u32 sz)
++void eeprom_read_sz(_adapter * padapter, u16 reg, u8* data, u32 sz)
+{
+
+ u16 x, data16;
+ u32 i;
-+_func_enter_;
++_func_enter_;
+ if(padapter->bSurpriseRemoved==_TRUE){
+ RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==_TRUE"));
+ goto out;
@@ -11416,12 +11409,12 @@ index 000000000000..fd07d64d8724
+ {
+ data16 = shift_in_bits(padapter);
+ data[i] = data16 & 0xff;
-+ data[i+1] = data16 >>8;
++ data[i+1] = data16 >>8;
+ }
+
+ eeprom_clean(padapter);
-+out:
-+_func_exit_;
++out:
++_func_exit_;
+
+
+
@@ -11433,7 +11426,7 @@ index 000000000000..fd07d64d8724
+{
+ u8 quotient, remainder, addr_2align_odd;
+ u16 reg, stmp , i=0, idx = 0;
-+_func_enter_;
++_func_enter_;
+ reg = (u16)(addr_off >> 1);
+ addr_2align_odd = (u8)(addr_off & 0x1);
+
@@ -11443,7 +11436,7 @@ index 000000000000..fd07d64d8724
+ rbuf[idx++] = (u8) ((stmp>>8)&0xff); //return hogh-part of the short
+ reg++; sz--;
+ }
-+
++
+ quotient = sz >> 1;
+ remainder = sz & 0x1;
+
@@ -11453,13 +11446,13 @@ index 000000000000..fd07d64d8724
+ rbuf[idx++] = (u8) (stmp&0xff);
+ rbuf[idx++] = (u8) ((stmp>>8)&0xff);
+ }
-+
++
+ reg = reg+i;
+ if(remainder){ //end of read at lower part of short : 0,2,4,6,...
+ stmp = eeprom_read16(padapter, reg);
-+ rbuf[idx] = (u8)(stmp & 0xff);
++ rbuf[idx] = (u8)(stmp & 0xff);
+ }
-+_func_exit_;
++_func_exit_;
+ return _TRUE;
+}
+
@@ -11468,22 +11461,21 @@ index 000000000000..fd07d64d8724
+VOID read_eeprom_content(_adapter * padapter)
+{
+
-+_func_enter_;
++_func_enter_;
+
+
-+_func_exit_;
++_func_exit_;
+}
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c
new file mode 100755
-index 000000000000..f89ce4a00323
+index 000000000000..9470d72ac6a1
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c
-@@ -0,0 +1,1916 @@
+@@ -0,0 +1,1915 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -11529,16 +11521,16 @@ index 000000000000..f89ce4a00323
+u8 RSN_CIPHER_SUITE_CCMP[] = { 0x00, 0x0f, 0xac, 4 };
+u8 RSN_CIPHER_SUITE_WEP104[] = { 0x00, 0x0f, 0xac, 5 };
+//-----------------------------------------------------------
-+// for adhoc-master to generate ie and provide supported-rate to fw
++// for adhoc-master to generate ie and provide supported-rate to fw
+//-----------------------------------------------------------
+
-+static u8 WIFI_CCKRATES[] =
++static u8 WIFI_CCKRATES[] =
+{(IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK),
+ (IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK),
+ (IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK),
+ (IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK)};
+
-+static u8 WIFI_OFDMRATES[] =
++static u8 WIFI_OFDMRATES[] =
+{(IEEE80211_OFDM_RATE_6MB),
+ (IEEE80211_OFDM_RATE_9MB),
+ (IEEE80211_OFDM_RATE_12MB),
@@ -11563,17 +11555,17 @@ index 000000000000..f89ce4a00323
+}
+
+uint rtw_is_cckrates_included(u8 *rate)
-+{
-+ u32 i = 0;
++{
++ u32 i = 0;
+
+ while(rate[i]!=0)
-+ {
-+ if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
-+ (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) )
-+ return _TRUE;
++ {
++ if ( (((rate[i]) & 0x7f) == 2) || (((rate[i]) & 0x7f) == 4) ||
++ (((rate[i]) & 0x7f) == 11) || (((rate[i]) & 0x7f) == 22) )
++ return _TRUE;
+ i++;
+ }
-+
++
+ return _FALSE;
+}
+
@@ -11587,11 +11579,11 @@ index 000000000000..f89ce4a00323
+ if ( (((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
+ (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22) )
+
-+ return _FALSE;
++ return _FALSE;
+
+ i++;
+ }
-+
++
+ return _TRUE;
+
+}
@@ -11604,17 +11596,17 @@ index 000000000000..f89ce4a00323
+ return WIRELESS_INVALID;
+ else
+ return WIRELESS_11A;
-+ }
++ }
+ else // could be pure B, pure G, or B/G
+ {
-+ if ((rtw_is_cckratesonly_included(rate)) == _TRUE)
++ if ((rtw_is_cckratesonly_included(rate)) == _TRUE)
+ return WIRELESS_11B;
+ else if((rtw_is_cckrates_included(rate)) == _TRUE)
+ return WIRELESS_11BG;
+ else
+ return WIRELESS_11G;
+ }
-+
++
+}
+
+u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source,
@@ -11628,10 +11620,10 @@ index 000000000000..f89ce4a00323
+// rtw_set_ie will update frame length
+u8 *rtw_set_ie
+(
-+ u8 *pbuf,
-+ sint index,
++ u8 *pbuf,
++ sint index,
+ uint len,
-+ u8 *source,
++ u8 *source,
+ uint *frlen //frame length
+)
+{
@@ -11642,11 +11634,11 @@ index 000000000000..f89ce4a00323
+
+ if (len > 0)
+ _rtw_memcpy((void *)(pbuf + 2), (void *)source, len);
-+
++
+ *frlen = *frlen + (len + 2);
-+
++
+ return (pbuf + len + 2);
-+_func_exit_;
++_func_exit_;
+}
+
+inline u8 *rtw_set_ie_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode,
@@ -11711,7 +11703,7 @@ index 000000000000..f89ce4a00323
+ u8 *p;
+_func_enter_;
+ if (limit < 1){
-+ _func_exit_;
++ _func_exit_;
+ return NULL;
+ }
+
@@ -11734,7 +11726,7 @@ index 000000000000..f89ce4a00323
+ if (i >= limit)
+ break;
+ }
-+_func_exit_;
++_func_exit_;
+ return NULL;
+}
+
@@ -11773,7 +11765,7 @@ index 000000000000..f89ce4a00323
+
+ if(ie)
+ _rtw_memcpy(ie, &in_ie[cnt], in_ie[cnt+1]+2);
-+
++
+ if(ielen)
+ *ielen = in_ie[cnt+1]+2;
+
@@ -11781,10 +11773,10 @@ index 000000000000..f89ce4a00323
+ }
+ else
+ {
-+ cnt+=in_ie[cnt+1]+2; //goto next
-+ }
++ cnt+=in_ie[cnt+1]+2; //goto next
++ }
+
-+ }
++ }
+
+ return target_ie;
+}
@@ -11807,7 +11799,7 @@ index 000000000000..f89ce4a00323
+ u32 target_ielen;
+ u8 *start;
+ uint search_len;
-+
++
+ if(!ies || !ies_len || *ies_len <= offset)
+ goto exit;
+
@@ -11820,7 +11812,7 @@ index 000000000000..f89ce4a00323
+ u8 buf[MAX_IE_SZ] = {0};
+ u8 *remain_ies = target_ie + target_ielen;
+ uint remain_len = search_len - (remain_ies - start);
-+
++
+ _rtw_memcpy(buf, remain_ies, remain_len);
+ _rtw_memcpy(target_ie, buf, remain_len);
+ *ies_len = *ies_len - target_ielen;
@@ -11836,25 +11828,25 @@ index 000000000000..f89ce4a00323
+ return ret;
+}
+
-+void rtw_set_supported_rate(u8* SupportedRates, uint mode)
++void rtw_set_supported_rate(u8* SupportedRates, uint mode)
+{
+_func_enter_;
+
+ _rtw_memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX);
-+
++
+ switch (mode)
+ {
+ case WIRELESS_11B:
+ _rtw_memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
+ break;
-+
++
+ case WIRELESS_11G:
+ case WIRELESS_11A:
+ case WIRELESS_11_5N:
+ case WIRELESS_11A_5N://Todo: no basic rate for ofdm ?
+ _rtw_memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
+ break;
-+
++
+ case WIRELESS_11BG:
+ case WIRELESS_11G_24N:
+ case WIRELESS_11_24N:
@@ -11862,26 +11854,26 @@ index 000000000000..f89ce4a00323
+ _rtw_memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
+ _rtw_memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
+ break;
-+
++
+ }
-+_func_exit_;
++_func_exit_;
+}
+
+uint rtw_get_rateset_len(u8 *rateset)
+{
+ uint i = 0;
-+_func_enter_;
++_func_enter_;
+ while(1)
+ {
+ if ((rateset[i]) == 0)
+ break;
-+
++
+ if (i > 12)
+ break;
-+
-+ i++;
++
++ i++;
+ }
-+_func_exit_;
++_func_exit_;
+ return i;
+}
+
@@ -11891,35 +11883,35 @@ index 000000000000..f89ce4a00323
+ int sz = 0, rateLen;
+ WLAN_BSSID_EX* pdev_network = &pregistrypriv->dev_network;
+ u8* ie = pdev_network->IEs;
-+
-+_func_enter_;
++
++_func_enter_;
+
+ //timestamp will be inserted by hardware
-+ sz += 8;
++ sz += 8;
+ ie += sz;
-+
++
+ //beacon interval : 2bytes
+ *(u16*)ie = cpu_to_le16((u16)pdev_network->Configuration.BeaconPeriod);//BCN_INTERVAL;
-+ sz += 2;
++ sz += 2;
+ ie += 2;
-+
++
+ //capability info
+ *(u16*)ie = 0;
-+
++
+ *(u16*)ie |= cpu_to_le16(cap_IBSS);
+
+ if(pregistrypriv->preamble == PREAMBLE_SHORT)
+ *(u16*)ie |= cpu_to_le16(cap_ShortPremble);
-+
++
+ if (pdev_network->Privacy)
+ *(u16*)ie |= cpu_to_le16(cap_Privacy);
-+
++
+ sz += 2;
+ ie += 2;
-+
++
+ //SSID
+ ie = rtw_set_ie(ie, _SSID_IE_, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz);
-+
++
+ //supported rates
+ if(pregistrypriv->wireless_mode == WIRELESS_11ABGN)
+ {
@@ -11932,9 +11924,9 @@ index 000000000000..f89ce4a00323
+ {
+ wireless_mode = pregistrypriv->wireless_mode;
+ }
-+
++
+ rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode) ;
-+
++
+ rateLen = rtw_get_rateset_len(pdev_network->SupportedRates);
+
+ if (rateLen > 8)
@@ -11952,17 +11944,17 @@ index 000000000000..f89ce4a00323
+
+
+ //IBSS Parameter Set
-+
++
+ ie = rtw_set_ie(ie, _IBSS_PARA_IE_, 2, (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz);
+
+ if (rateLen > 8)
-+ {
++ {
+ ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);
+ }
-+
-+
++
++
+ //HT Cap.
-+ if(((pregistrypriv->wireless_mode&WIRELESS_11_5N)||(pregistrypriv->wireless_mode&WIRELESS_11_24N))
++ if(((pregistrypriv->wireless_mode&WIRELESS_11_5N)||(pregistrypriv->wireless_mode&WIRELESS_11_24N))
+ && (pregistrypriv->ht_enable==_TRUE))
+ {
+ //todo:
@@ -11985,7 +11977,7 @@ index 000000000000..f89ce4a00323
+ unsigned char wpa_oui_type[] = {0x00, 0x50, 0xf2, 0x01};
+ u8 *pbuf = pie;
+
-+ while(1)
++ while(1)
+ {
+ pbuf = rtw_get_ie(pbuf, _WPA_IE_ID_, &len, limit);
+
@@ -12030,7 +12022,7 @@ index 000000000000..f89ce4a00323
+}
+
+unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit)
-+{
++{
+
+ return rtw_get_ie(pie, _WPA2_IE_ID_,rsn_ie_len, limit);
+
@@ -12080,68 +12072,68 @@ index 000000000000..f89ce4a00323
+ return _FAIL;
+ }
+
-+
++
+ if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie+1) != (u8)(wpa_ie_len - 2)) ||
+ (_rtw_memcmp(wpa_ie+2, RTW_WPA_OUI_TYPE, WPA_SELECTOR_LEN) != _TRUE) )
-+ {
++ {
+ return _FAIL;
+ }
+
+ pos = wpa_ie;
+
+ pos += 8;
-+ left = wpa_ie_len - 8;
++ left = wpa_ie_len - 8;
+
+
+ //group_cipher
+ if (left >= WPA_SELECTOR_LEN) {
+
+ *group_cipher = rtw_get_wpa_cipher_suite(pos);
-+
++
+ pos += WPA_SELECTOR_LEN;
+ left -= WPA_SELECTOR_LEN;
-+
-+ }
++
++ }
+ else if (left > 0)
+ {
+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __FUNCTION__, left));
-+
++
+ return _FAIL;
+ }
+
+
+ //pairwise_cipher
+ if (left >= 2)
-+ {
-+ //count = le16_to_cpu(*(u16*)pos);
++ {
++ //count = le16_to_cpu(*(u16*)pos);
+ count = RTW_GET_LE16(pos);
+ pos += 2;
+ left -= 2;
-+
++
+ if (count == 0 || left < count * WPA_SELECTOR_LEN) {
+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), "
-+ "count %u left %u", __FUNCTION__, count, left));
++ "count %u left %u", __FUNCTION__, count, left));
+ return _FAIL;
+ }
-+
++
+ for (i = 0; i < count; i++)
+ {
+ *pairwise_cipher |= rtw_get_wpa_cipher_suite(pos);
-+
++
+ pos += WPA_SELECTOR_LEN;
+ left -= WPA_SELECTOR_LEN;
+ }
-+
-+ }
++
++ }
+ else if (left == 1)
+ {
+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __FUNCTION__));
+ return _FAIL;
+ }
+
-+
++
+ return ret;
-+
++
+}
+
+int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwise_cipher)
@@ -12157,22 +12149,22 @@ index 000000000000..f89ce4a00323
+
+
+ if ((*rsn_ie!= _WPA2_IE_ID_) || (*(rsn_ie+1) != (u8)(rsn_ie_len - 2)))
-+ {
++ {
+ return _FAIL;
+ }
-+
++
+ pos = rsn_ie;
+ pos += 4;
-+ left = rsn_ie_len - 4;
++ left = rsn_ie_len - 4;
+
+ //group_cipher
+ if (left >= RSN_SELECTOR_LEN) {
+
+ *group_cipher = rtw_get_wpa2_cipher_suite(pos);
-+
++
+ pos += RSN_SELECTOR_LEN;
+ left -= RSN_SELECTOR_LEN;
-+
++
+ } else if (left > 0) {
+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __FUNCTION__, left));
+ return _FAIL;
@@ -12180,7 +12172,7 @@ index 000000000000..f89ce4a00323
+
+ //pairwise_cipher
+ if (left >= 2)
-+ {
++ {
+ //count = le16_to_cpu(*(u16*)pos);
+ count = RTW_GET_LE16(pos);
+ pos += 2;
@@ -12188,29 +12180,29 @@ index 000000000000..f89ce4a00323
+
+ if (count == 0 || left < count * RSN_SELECTOR_LEN) {
+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), "
-+ "count %u left %u", __FUNCTION__, count, left));
++ "count %u left %u", __FUNCTION__, count, left));
+ return _FAIL;
+ }
-+
++
+ for (i = 0; i < count; i++)
-+ {
++ {
+ *pairwise_cipher |= rtw_get_wpa2_cipher_suite(pos);
-+
++
+ pos += RSN_SELECTOR_LEN;
+ left -= RSN_SELECTOR_LEN;
+ }
+
-+ }
++ }
+ else if (left == 1)
+ {
+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __FUNCTION__));
-+
++
+ return _FAIL;
+ }
+
+
+ return ret;
-+
++
+}
+
+int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16 *wpa_len)
@@ -12218,22 +12210,22 @@ index 000000000000..f89ce4a00323
+ u8 authmode, sec_idx, i;
+ u8 wpa_oui[4]={0x0,0x50,0xf2,0x01};
+ uint cnt;
-+
++
+_func_enter_;
+
+ //Search required WPA or WPA2 IE and copy to sec_ie[ ]
-+
++
+ cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);
-+
++
+ sec_idx=0;
-+
++
+ while(cnt<in_len)
+ {
+ authmode=in_ie[cnt];
-+
++
+ if((authmode==_WPA_IE_ID_)&&(_rtw_memcmp(&in_ie[cnt+2], &wpa_oui[0],4)==_TRUE))
-+ {
-+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_get_wpa_ie: sec_idx=%d in_ie[cnt+1]+2=%d\n",sec_idx,in_ie[cnt+1]+2));
++ {
++ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_get_wpa_ie: sec_idx=%d in_ie[cnt+1]+2=%d\n",sec_idx,in_ie[cnt+1]+2));
+
+ _rtw_memcpy(wpa_ie, &in_ie[cnt],in_ie[cnt+1]+2);
+
@@ -12248,7 +12240,7 @@ index 000000000000..f89ce4a00323
+ {
+ if(authmode==_WPA2_IE_ID_)
+ {
-+ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n get_rsn_ie: sec_idx=%d in_ie[cnt+1]+2=%d\n",sec_idx,in_ie[cnt+1]+2));
++ RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n get_rsn_ie: sec_idx=%d in_ie[cnt+1]+2=%d\n",sec_idx,in_ie[cnt+1]+2));
+
+ _rtw_memcpy(rsn_ie, &in_ie[cnt],in_ie[cnt+1]+2);
+
@@ -12262,32 +12254,32 @@ index 000000000000..f89ce4a00323
+ else
+ {
+ cnt+=in_ie[cnt+1]+2; //get next
-+ }
++ }
+ }
-+
++
+ }
-+
++
+_func_exit_;
+
+ return (*rsn_len+*wpa_len);
-+
++
+}
+
+u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen)
-+{
++{
+ u8 match = _FALSE;
+ u8 eid, wps_oui[4]={0x0,0x50,0xf2,0x04};
-+
++
+ if(ie_ptr == NULL) return match;
-+
++
+ eid = ie_ptr[0];
-+
++
+ if((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&ie_ptr[2], wps_oui, 4)==_TRUE))
-+ {
-+ //printk("==> found WPS_IE.....\n");
-+ *wps_ielen = ie_ptr[1]+2;
++ {
++ //printk("==> found WPS_IE.....\n");
++ *wps_ielen = ie_ptr[1]+2;
+ match=_TRUE;
-+ }
++ }
+ return match;
+}
+
@@ -12324,20 +12316,20 @@ index 000000000000..f89ce4a00323
+
+ if(wps_ie)
+ _rtw_memcpy(wps_ie, &in_ie[cnt], in_ie[cnt+1]+2);
-+
++
+ if(wps_ielen)
+ *wps_ielen = in_ie[cnt+1]+2;
-+
++
+ cnt+=in_ie[cnt+1]+2;
+
+ break;
+ }
+ else
+ {
-+ cnt+=in_ie[cnt+1]+2; //goto next
-+ }
++ cnt+=in_ie[cnt+1]+2; //goto next
++ }
+
-+ }
++ }
+
+ return wpsie_ptr;
+}
@@ -12369,33 +12361,33 @@ index 000000000000..f89ce4a00323
+
+ // 6 = 1(Element ID) + 1(Length) + 4(WPS OUI)
+ attr_ptr = wps_ie + 6; //goto first attr
-+
++
+ while(attr_ptr - wps_ie < wps_ielen)
+ {
+ // 4 = 2(Attribute ID) + 2(Length)
+ u16 attr_id = RTW_GET_BE16(attr_ptr);
+ u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2);
+ u16 attr_len = attr_data_len + 4;
-+
++
+ //DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len);
+ if( attr_id == target_attr_id )
+ {
+ target_attr_ptr = attr_ptr;
-+
++
+ if(buf_attr)
+ _rtw_memcpy(buf_attr, attr_ptr, attr_len);
-+
++
+ if(len_attr)
+ *len_attr = attr_len;
-+
++
+ break;
+ }
+ else
+ {
+ attr_ptr += attr_len; //goto next
-+ }
-+
-+ }
++ }
++
++ }
+
+ return target_attr_ptr;
+}
@@ -12417,7 +12409,7 @@ index 000000000000..f89ce4a00323
+
+ if(len_content)
+ *len_content = 0;
-+
++
+ attr_ptr = rtw_get_wps_attr(wps_ie, wps_ielen, target_attr_id, NULL, &attr_len);
+
+ if(attr_ptr && attr_len)
@@ -12528,7 +12520,7 @@ index 000000000000..f89ce4a00323
+ }
+
+ return 0;
-+
++
+}
+
+/**
@@ -12561,7 +12553,7 @@ index 000000000000..f89ce4a00323
+ DBG_871X("IEEE 802.11 element "
+ "parse failed (id=%d elen=%d "
+ "left=%lu)\n",
-+ id, elen, (unsigned long) left);
++ id, elen, (unsigned long) left);
+ }
+ return ParseFailed;
+ }
@@ -12663,7 +12655,7 @@ index 000000000000..f89ce4a00323
+ return ParseFailed;
+
+ return unknown ? ParseUnknown : ParseOK;
-+
++
+}
+
+static u8 key_char2num(u8 ch);
@@ -12701,7 +12693,7 @@ index 000000000000..f89ce4a00323
+{
+ u8 mac[ETH_ALEN];
+ if(mac_addr == NULL) return;
-+
++
+ if ( rtw_initmac )
+ { // Users specify the mac address
+ int jj,kk;
@@ -12716,7 +12708,7 @@ index 000000000000..f89ce4a00323
+ { // Use the mac address stored in the Efuse
+ _rtw_memcpy(mac, mac_addr, ETH_ALEN);
+ }
-+
++
+ if (((mac[0]==0xff) &&(mac[1]==0xff) && (mac[2]==0xff) &&
+ (mac[3]==0xff) && (mac[4]==0xff) &&(mac[5]==0xff)) ||
+ ((mac[0]==0x0) && (mac[1]==0x0) && (mac[2]==0x0) &&
@@ -12731,7 +12723,7 @@ index 000000000000..f89ce4a00323
+ // use default mac addresss
+ _rtw_memcpy(mac_addr, mac, ETH_ALEN);
+ DBG_871X("MAC Address from efuse error, assign default one !!!\n");
-+ }
++ }
+
+ DBG_871X("rtw_macaddr_cfg MAC Address = "MAC_FMT"\n", MAC_ARG(mac_addr));
+}
@@ -12739,7 +12731,7 @@ index 000000000000..f89ce4a00323
+void dump_ies(u8 *buf, u32 buf_len) {
+ u8* pos = (u8*)buf;
+ u8 id, len;
-+
++
+ while(pos-buf<=buf_len){
+ id = *pos;
+ len = *(pos+1);
@@ -12751,7 +12743,7 @@ index 000000000000..f89ce4a00323
+ dump_wps_ie(pos, len);
+
+ pos+=(2+len);
-+ }
++ }
+}
+
+void dump_wps_ie(u8 *ie, u32 ie_len) {
@@ -12761,7 +12753,7 @@ index 000000000000..f89ce4a00323
+
+ u8 *wps_ie;
+ uint wps_ielen;
-+
++
+ wps_ie = rtw_get_wps_ie(ie, ie_len, NULL, &wps_ielen);
+ if(wps_ie != ie || wps_ielen == 0)
+ return;
@@ -12774,7 +12766,7 @@ index 000000000000..f89ce4a00323
+ DBG_871X("%s ID:0x%04x, LEN:%u\n", __FUNCTION__, id, len);
+
+ pos+=(4+len);
-+ }
++ }
+}
+
+#ifdef CONFIG_P2P
@@ -12856,7 +12848,7 @@ index 000000000000..f89ce4a00323
+
+ u8 *p2p_ie;
+ uint p2p_ielen;
-+
++
+ p2p_ie = rtw_get_p2p_ie(ie, ie_len, NULL, &p2p_ielen);
+ if(p2p_ie != ie || p2p_ielen == 0)
+ return;
@@ -12869,7 +12861,7 @@ index 000000000000..f89ce4a00323
+ DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len);
+
+ pos+=(3+len);
-+ }
++ }
+}
+
+/**
@@ -12902,7 +12894,7 @@ index 000000000000..f89ce4a00323
+ if( ( eid == _VENDOR_SPECIFIC_IE_ ) && ( _rtw_memcmp( &in_ie[cnt+2], p2p_oui, 4) == _TRUE ) )
+ {
+ p2p_ie_ptr = in_ie + cnt;
-+
++
+ if ( p2p_ie != NULL )
+ {
+ _rtw_memcpy( p2p_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
@@ -12912,17 +12904,17 @@ index 000000000000..f89ce4a00323
+ {
+ *p2p_ielen = in_ie[ cnt + 1 ] + 2;
+ }
-+
++
+ return p2p_ie_ptr;
+
+ break;
+ }
+ else
+ {
-+ cnt += in_ie[ cnt + 1 ] +2; //goto next
-+ }
-+
-+ }
++ cnt += in_ie[ cnt + 1 ] +2; //goto next
++ }
++
++ }
+
+ return NULL;
+
@@ -12955,33 +12947,33 @@ index 000000000000..f89ce4a00323
+
+ // 6 = 1(Element ID) + 1(Length) + 3 (OUI) + 1(OUI Type)
+ attr_ptr = p2p_ie + 6; //goto first attr
-+
++
+ while(attr_ptr - p2p_ie < p2p_ielen)
+ {
+ // 3 = 1(Attribute ID) + 2(Length)
+ u8 attr_id = *attr_ptr;
+ u16 attr_data_len = RTW_GET_LE16(attr_ptr + 1);
+ u16 attr_len = attr_data_len + 3;
-+
++
+ //DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len);
+ if( attr_id == target_attr_id )
+ {
+ target_attr_ptr = attr_ptr;
-+
++
+ if(buf_attr)
+ _rtw_memcpy(buf_attr, attr_ptr, attr_len);
-+
++
+ if(len_attr)
+ *len_attr = attr_len;
-+
++
+ break;
+ }
+ else
+ {
+ attr_ptr += attr_len; //goto next
-+ }
-+
-+ }
++ }
++
++ }
+
+ return target_attr_ptr;
+}
@@ -13003,7 +12995,7 @@ index 000000000000..f89ce4a00323
+
+ if(len_content)
+ *len_content = 0;
-+
++
+ attr_ptr = rtw_get_p2p_attr(p2p_ie, p2p_ielen, target_attr_id, NULL, &attr_len);
+
+ if(attr_ptr && attr_len)
@@ -13021,19 +13013,19 @@ index 000000000000..f89ce4a00323
+}
+
+u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr)
-+{
++{
+ u32 a_len;
+
+ *pbuf = attr_id;
-+
++
+ //*(u16*)(pbuf + 1) = cpu_to_le16(attr_len);
+ RTW_PUT_LE16(pbuf + 1, attr_len);
+
+ if(pdata_attr)
-+ _rtw_memcpy(pbuf + 3, pdata_attr, attr_len);
-+
++ _rtw_memcpy(pbuf + 3, pdata_attr, attr_len);
++
+ a_len = attr_len + 3;
-+
++
+ return a_len;
+}
+
@@ -13084,8 +13076,8 @@ index 000000000000..f89ce4a00323
+ u8 *p2p_ie;
+ uint p2p_ielen, p2p_ielen_ori;
+ int cnt;
-+
-+ if( (p2p_ie=rtw_get_p2p_ie(bss_ex->IEs+_FIXED_IE_LENGTH_, bss_ex->IELength-_FIXED_IE_LENGTH_, NULL, &p2p_ielen_ori)) )
++
++ if( (p2p_ie=rtw_get_p2p_ie(bss_ex->IEs+_FIXED_IE_LENGTH_, bss_ex->IELength-_FIXED_IE_LENGTH_, NULL, &p2p_ielen_ori)) )
+ {
+ #if 0
+ if(rtw_get_p2p_attr(p2p_ie, p2p_ielen_ori, attr_id, NULL, NULL)) {
@@ -13096,7 +13088,7 @@ index 000000000000..f89ce4a00323
+
+ p2p_ielen=rtw_p2p_attr_remove(p2p_ie, p2p_ielen_ori, attr_id);
+ if(p2p_ielen != p2p_ielen_ori) {
-+
++
+ u8 *next_ie_ori = p2p_ie+p2p_ielen_ori;
+ u8 *next_ie = p2p_ie+p2p_ielen;
+ uint remain_len = bss_ex->IELength-(next_ie_ori-bss_ex->IEs);
@@ -13119,7 +13111,7 @@ index 000000000000..f89ce4a00323
+int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen)
+{
+ int match;
-+ uint cnt = 0;
++ uint cnt = 0;
+ u8 eid, wfd_oui[4]={0x50,0x6F,0x9A,0x0A};
+
+
@@ -13129,17 +13121,17 @@ index 000000000000..f89ce4a00323
+ {
+ return match;
+ }
-+
++
+ while(cnt<in_len)
+ {
+ eid = in_ie[cnt];
-+
++
+ if( ( eid == _VENDOR_SPECIFIC_IE_ ) && ( _rtw_memcmp( &in_ie[cnt+2], wfd_oui, 4) == _TRUE ) )
+ {
+ if ( wfd_ie != NULL )
+ {
+ _rtw_memcpy( wfd_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
-+
++
+ }
+ else
+ {
@@ -13148,12 +13140,12 @@ index 000000000000..f89ce4a00323
+ *wfd_ielen = 0;
+ }
+ }
-+
++
+ if ( wfd_ielen != NULL )
+ {
+ *wfd_ielen = in_ie[ cnt + 1 ] + 2;
+ }
-+
++
+ cnt += in_ie[ cnt + 1 ] + 2;
+
+ match = _TRUE;
@@ -13161,16 +13153,16 @@ index 000000000000..f89ce4a00323
+ }
+ else
+ {
-+ cnt += in_ie[ cnt + 1 ] +2; //goto next
-+ }
-+
-+ }
++ cnt += in_ie[ cnt + 1 ] +2; //goto next
++ }
++
++ }
+
+ if ( match == _TRUE )
+ {
+ match = cnt;
+ }
-+
++
+ return match;
+
+}
@@ -13180,7 +13172,7 @@ index 000000000000..f89ce4a00323
+int rtw_get_wfd_attr_content(u8 *wfd_ie, uint wfd_ielen, u8 target_attr_id ,u8 *attr_content, uint *attr_contentlen)
+{
+ int match;
-+ uint cnt = 0;
++ uint cnt = 0;
+ u8 attr_id, wfd_oui[4]={0x50,0x6F,0x9A,0x0A};
+
+
@@ -13196,18 +13188,18 @@ index 000000000000..f89ce4a00323
+ cnt = 6;
+ while( cnt < wfd_ielen )
+ {
-+ u16 attrlen = RTW_GET_BE16(wfd_ie + cnt + 1);
-+
++ u16 attrlen = RTW_GET_BE16(wfd_ie + cnt + 1);
++
+ attr_id = wfd_ie[cnt];
+ if( attr_id == target_attr_id )
+ {
+ // 3 -> 1 byte for attribute ID field, 2 bytes for length field
+ if(attr_content)
+ _rtw_memcpy( attr_content, &wfd_ie[ cnt + 3 ], attrlen );
-+
++
+ if(attr_contentlen)
+ *attr_contentlen = attrlen;
-+
++
+ cnt += attrlen + 3;
+
+ match = _TRUE;
@@ -13215,10 +13207,10 @@ index 000000000000..f89ce4a00323
+ }
+ else
+ {
-+ cnt += attrlen + 3; //goto next
-+ }
-+
-+ }
++ cnt += attrlen + 3; //goto next
++ }
++
++ }
+
+ return match;
+
@@ -13273,7 +13265,7 @@ index 000000000000..f89ce4a00323
+u16 rtw_mcs_rate(u8 rf_type, u8 bw_40MHz, u8 short_GI_20, u8 short_GI_40, unsigned char * MCS_rate)
+{
+ u16 max_rate = 0;
-+
++
+ if(rf_type == RF_1T1R)
+ {
+ if(MCS_rate[0] & BIT(7))
@@ -13395,13 +13387,12 @@ index 000000000000..f89ce4a00323
+ action = (action >= ACT_PUBLIC_MAX) ? ACT_PUBLIC_MAX : action;
+ return _action_public_str[action];
+}
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c
new file mode 100755
-index 000000000000..4ffaa50d3c5d
+index 000000000000..3e8ee42fe798
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c
-@@ -0,0 +1,464 @@
+@@ -0,0 +1,462 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
@@ -13533,7 +13524,7 @@ index 000000000000..4ffaa50d3c5d
+
+ ret = _write8(pintfhdl, addr, val);
+ _func_exit_;
-+
++
+ return RTW_STATUS_CODE(ret);
+}
+int _rtw_write16(_adapter *adapter, u32 addr, u16 val)
@@ -13638,7 +13629,7 @@ index 000000000000..4ffaa50d3c5d
+
+ if( (adapter->bDriverStopped ==_TRUE) || (adapter->bSurpriseRemoved == _TRUE))
+ {
-+ RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved));
++ RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved));
+ return;
+ }
+
@@ -13678,7 +13669,7 @@ index 000000000000..4ffaa50d3c5d
+
+ if( (adapter->bDriverStopped ==_TRUE) || (adapter->bSurpriseRemoved == _TRUE))
+ {
-+ RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved));
++ RT_TRACE(_module_rtl871x_io_c_, _drv_info_, ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)", adapter->bDriverStopped, adapter->bSurpriseRemoved));
+ return;
+ }
+
@@ -13714,7 +13705,7 @@ index 000000000000..4ffaa50d3c5d
+ _func_enter_;
+
+ _write_port = pintfhdl->io_ops._write_port;
-+
++
+ ret = _write_port(pintfhdl, addr, cnt, pmem);
+
+ _func_exit_;
@@ -13773,12 +13764,12 @@ index 000000000000..4ffaa50d3c5d
+
+u16 read_sniff_ranges[][2] = {
+ //{0x550, 0x551},
-+};
++};
+
+u16 write_sniff_ranges[][2] = {
+ //{0x550, 0x551},
+ //{0x4c, 0x4c},
-+};
++};
+
+int read_sniff_num = sizeof(read_sniff_ranges)/sizeof(u16)/2;
+int write_sniff_num = sizeof(write_sniff_ranges)/sizeof(u16)/2;
@@ -13790,7 +13781,7 @@ index 000000000000..4ffaa50d3c5d
+ if (addr + len > read_sniff_ranges[i][0] && addr <= read_sniff_ranges[i][1])
+ return _TRUE;
+ }
-+
++
+ return _FALSE;
+}
+
@@ -13801,7 +13792,7 @@ index 000000000000..4ffaa50d3c5d
+ if (addr + len > write_sniff_ranges[i][0] && addr <= write_sniff_ranges[i][1])
+ return _TRUE;
+ }
-+
++
+ return _FALSE;
+}
+
@@ -13818,7 +13809,7 @@ index 000000000000..4ffaa50d3c5d
+u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line)
+{
+ u16 val = _rtw_read16(adapter, addr);
-+
++
+ if (match_read_sniff_ranges(addr, 2))
+ DBG_871X("DBG_IO %s:%d rtw_read16(0x%04x) return 0x%04x\n", caller, line, addr, val);
+
@@ -13828,7 +13819,7 @@ index 000000000000..4ffaa50d3c5d
+u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line)
+{
+ u32 val = _rtw_read32(adapter, addr);
-+
++
+ if (match_read_sniff_ranges(addr, 4))
+ DBG_871X("DBG_IO %s:%d rtw_read32(0x%04x) return 0x%08x\n", caller, line, addr, val);
+
@@ -13839,21 +13830,21 @@ index 000000000000..4ffaa50d3c5d
+{
+ if (match_write_sniff_ranges(addr, 1))
+ DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val);
-+
++
+ return _rtw_write8(adapter, addr, val);
+}
+int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
+{ +{
+ if (match_write_sniff_ranges(addr, 2))
+ DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val);
-+
++
+ return _rtw_write16(adapter, addr, val);
+}
+int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
+{ +{
+ if (match_write_sniff_ranges(addr, 4))
+ DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val);
-+ -+
++++
+ return _rtw_write32(adapter, addr, val);
+}
+int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line)
@@ -13864,18 +13855,16 @@ index 000000000000..4ffaa50d3c5d
+ return _rtw_writeN(adapter, addr, length, data);
+}
+#endif
-+
-+-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c
new file mode 100755
-index 000000000000..06018867e34d
+index 000000000000..a67b08dce3b2
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c
-@@ -0,0 +1,196 @@
+@@ -0,0 +1,195 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -13911,23 +13900,23 @@ index 000000000000..06018867e34d
+ u32 * pulOutLen
+)
+{
-+ static NDIS_802_11_AUTHENTICATION_ENCRYPTION szAuthEnc[] =
++ static NDIS_802_11_AUTHENTICATION_ENCRYPTION szAuthEnc[] =
+ {
-+ {Ndis802_11AuthModeOpen, Ndis802_11EncryptionDisabled},
++ {Ndis802_11AuthModeOpen, Ndis802_11EncryptionDisabled},
+ {Ndis802_11AuthModeOpen, Ndis802_11Encryption1Enabled},
-+ {Ndis802_11AuthModeShared, Ndis802_11EncryptionDisabled},
++ {Ndis802_11AuthModeShared, Ndis802_11EncryptionDisabled},
+ {Ndis802_11AuthModeShared, Ndis802_11Encryption1Enabled},
-+ {Ndis802_11AuthModeWPA, Ndis802_11Encryption2Enabled},
++ {Ndis802_11AuthModeWPA, Ndis802_11Encryption2Enabled},
+ {Ndis802_11AuthModeWPA, Ndis802_11Encryption3Enabled},
-+ {Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption2Enabled},
++ {Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption2Enabled},
+ {Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption3Enabled},
-+ {Ndis802_11AuthModeWPANone, Ndis802_11Encryption2Enabled},
++ {Ndis802_11AuthModeWPANone, Ndis802_11Encryption2Enabled},
+ {Ndis802_11AuthModeWPANone, Ndis802_11Encryption3Enabled},
-+ {Ndis802_11AuthModeWPA2, Ndis802_11Encryption2Enabled},
++ {Ndis802_11AuthModeWPA2, Ndis802_11Encryption2Enabled},
+ {Ndis802_11AuthModeWPA2, Ndis802_11Encryption3Enabled},
-+ {Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption2Enabled},
++ {Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption2Enabled},
+ {Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption3Enabled}
-+ };
++ };
+ static ULONG ulNumOfPairSupported = sizeof(szAuthEnc)/sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION);
+ NDIS_802_11_CAPABILITY * pCap = (NDIS_802_11_CAPABILITY *)pucBuf;
+ u8* pucAuthEncryptionSupported = (u8*) pCap->AuthenticationEncryptionSupported;
@@ -13936,9 +13925,9 @@ index 000000000000..06018867e34d
+ pCap->Length = sizeof(NDIS_802_11_CAPABILITY);
+ if(ulNumOfPairSupported > 1 )
+ pCap->Length += (ulNumOfPairSupported-1) * sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION);
-+
-+ pCap->Version = 2;
-+ pCap->NoOfPMKIDs = NUM_PMKID_CACHE;
++
++ pCap->Version = 2;
++ pCap->NoOfPMKIDs = NUM_PMKID_CACHE;
+ pCap->NoOfAuthEncryptPairsSupported = ulNumOfPairSupported;
+
+ if( sizeof (szAuthEnc) <= 240 ) // 240 = 256 - 4*4 // SecurityInfo.szCapability: only 256 bytes in size.
@@ -13960,7 +13949,7 @@ index 000000000000..06018867e34d
+ struct wlan_network *tgt_network;
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+ struct security_priv *psecuritypriv=&(padapter->securitypriv);
-+ WLAN_BSSID_EX *psecnetwork=(WLAN_BSSID_EX*)&(psecuritypriv->sec_bss);
++ WLAN_BSSID_EX *psecnetwork=(WLAN_BSSID_EX*)&(psecuritypriv->sec_bss);
+ u8 * pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION);
+ unsigned char i,*auth_ie,*supp_ie;
+
@@ -13973,7 +13962,7 @@ index 000000000000..06018867e34d
+ //------------------------------------------------------
+ // Req_1. AvailableRequestFixedIEs
+ if(psecnetwork!=NULL){
-+
++
+ pAssocInfo->AvailableRequestFixedIEs |= NDIS_802_11_AI_REQFI_CAPABILITIES|NDIS_802_11_AI_REQFI_CURRENTAPADDRESS;
+ pAssocInfo->RequestFixedIEs.Capabilities = (unsigned short)* & psecnetwork->IEs[10];
+ _rtw_memcpy(pAssocInfo->RequestFixedIEs.CurrentAPAddress,
@@ -13983,12 +13972,12 @@ index 000000000000..06018867e34d
+
+ if(check_fwstate( pmlmepriv, _FW_UNDER_LINKING|_FW_LINKED)==_TRUE)
+ {
-+
++
+ if(psecuritypriv->ndisauthtype>=Ndis802_11AuthModeWPA2)
+ pDest[0] =48; //RSN Information Element
-+ else
++ else
+ pDest[0] =221; //WPA(SSN) Information Element
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n Adapter->ndisauthtype==Ndis802_11AuthModeWPA)?0xdd:0x30 [%d]",pDest[0]));
+ supp_ie=&psecuritypriv->supplicant_ie[0];
+ for(i=0;i<supp_ie[0];i++)
@@ -13996,34 +13985,34 @@ index 000000000000..06018867e34d
+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("IEs [%d] = 0x%x \n\n", i,supp_ie[i]));
+ }
+
-+ i=13; //0~11 is fixed information element
++ i=13; //0~11 is fixed information element
+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("i= %d tgt_network->network.IELength=%d\n\n", i,(int)psecnetwork->IELength));
+ while((i<supp_ie[0]) && (i<256)){
+ if((unsigned char)supp_ie[i]==pDest[0]){
+ _rtw_memcpy((u8 *)(pDest),
-+ &supp_ie[i],
++ &supp_ie[i],
+ supp_ie[1+i]+2);
-+
++
+ break;
+ }
-+
++
+ i=i+supp_ie[i+1]+2;
+ if(supp_ie[1+i]==0)
+ i=i+1;
+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("iteration i=%d IEs [%d] = 0x%x \n\n", i,i,supp_ie[i+1]));
-+
++
+ }
-+
++
+
+ pAssocInfo->RequestIELength += (2 + supp_ie[1+i]);// (2 + psecnetwork->IEs[1+i]+4);
+
+ }
-+
++
+
+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n psecnetwork != NULL,fwstate==_FW_UNDER_LINKING \n"));
+
+ }
-+
++
+
+ //------------------------------------------------------
+ // Association Response related information
@@ -14051,33 +14040,32 @@ index 000000000000..06018867e34d
+ i=auth_ie[0]-12;
+ if(i>0){
+ _rtw_memcpy((u8 *)&pDest[0],&auth_ie[1],i);
-+ pAssocInfo->ResponseIELength =i;
++ pAssocInfo->ResponseIELength =i;
+ }
+
+
-+ pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength;
++ pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength;
+
+
+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n tgt_network != NULL,fwstate==_FW_LINKED \n"));
+ }
-+ }
++ }
+ RT_TRACE(_module_rtl871x_ioctl_query_c_,_drv_info_,("\n exit query_802_11_association_information \n"));
+_func_exit_;
+
+ return _TRUE;
+}
+#endif
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c
new file mode 100755
-index 000000000000..31b4704d4347
+index 000000000000..4e663d7a6809
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c
@@ -0,0 +1,1031 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -14137,7 +14125,7 @@ index 000000000000..31b4704d4347
+ {1, &oid_rt_get_preamble_mode_hdl}, //0x96
+ {1, &oid_null_function}, //0x97
+ {1, &oid_rt_get_ap_ip_hdl}, //0x98
-+ {1, &oid_rt_get_channelplan_hdl}, //0x99
++ {1, &oid_rt_get_channelplan_hdl}, //0x99
+ {1, &oid_rt_set_preamble_mode_hdl}, //0x9A
+ {1, &oid_rt_set_bcn_intvl_hdl}, //0x9B
+ {1, &oid_null_function}, //0x9C
@@ -14153,7 +14141,7 @@ index 000000000000..31b4704d4347
+ {1, &oid_null_function}, //0xA6
+ {1, &oid_rt_get_total_tx_bytes_hdl}, //0xA7
+ {1, &oid_rt_get_total_rx_bytes_hdl}, //0xA8
-+ {1, &oid_rt_current_tx_power_level_hdl}, //0xA9
++ {1, &oid_rt_current_tx_power_level_hdl}, //0xA9
+ {1, &oid_rt_get_enc_key_mismatch_count_hdl}, //0xAA
+ {1, &oid_rt_get_enc_key_match_count_hdl}, //0xAB
+ {1, &oid_rt_get_channel_hdl}, //0xAC
@@ -14169,7 +14157,7 @@ index 000000000000..31b4704d4347
+ {1, &oid_null_function}, //0xB6
+ {1, &oid_null_function}, //0xB7
+ {1, &oid_null_function}, //0xB8
-+ {1, &oid_null_function}, //0xB9
++ {1, &oid_null_function}, //0xB9
+ {1, &oid_null_function}, //0xBA
+ {1, &oid_rt_supported_wireless_mode_hdl}, //0xBB
+ {1, &oid_rt_get_channel_list_hdl}, //0xBC
@@ -14185,14 +14173,14 @@ index 000000000000..31b4704d4347
+ {1, &oid_null_function}, //0xC6
+ {1, &oid_null_function}, //0xC7
+ {1, &oid_null_function}, //0xC8
-+ {1, &oid_null_function}, //0xC9
++ {1, &oid_null_function}, //0xC9
+ {1, &oid_null_function}, //0xCA
+ {1, &oid_null_function}, //0xCB
+ {1, &oid_null_function}, //0xCC
+ {1, &oid_null_function}, //0xCD
+ {1, &oid_null_function}, //0xCE
+ {1, &oid_null_function}, //0xCF
-+
++
+};
+
+struct oid_obj_priv oid_rtl_seg_01_03[] =
@@ -14208,7 +14196,7 @@ index 000000000000..31b4704d4347
+
+struct oid_obj_priv oid_rtl_seg_01_11[] =
+{
-+ {1, &oid_null_function}, //0xC0 OID_RT_PRO_RX_FILTER
++ {1, &oid_null_function}, //0xC0 OID_RT_PRO_RX_FILTER
+ {1, &oid_null_function}, //0xC1 OID_CE_USB_WRITE_REGISTRY
+ {1, &oid_null_function}, //0xC2 OID_CE_USB_READ_REGISTRY
+ {1, &oid_null_function}, //0xC3 OID_RT_PRO_SET_INITIAL_GAIN
@@ -14216,10 +14204,10 @@ index 000000000000..31b4704d4347
+ {1, &oid_null_function}, //0xC5 OID_RT_PRO_SET_BB_RF_SHUTDOWN_MODE
+ {1, &oid_null_function}, //0xC6 OID_RT_PRO_SET_TX_CHARGE_PUMP
+ {1, &oid_null_function}, //0xC7 OID_RT_PRO_SET_RX_CHARGE_PUMP
-+ {1, &oid_rt_pro_rf_write_registry_hdl}, //0xC8
-+ {1, &oid_rt_pro_rf_read_registry_hdl}, //0xC9
++ {1, &oid_rt_pro_rf_write_registry_hdl}, //0xC8
++ {1, &oid_rt_pro_rf_read_registry_hdl}, //0xC9
+ {1, &oid_null_function} //0xCA OID_RT_PRO_QUERY_RF_TYPE
-+
++
+};
+
+struct oid_obj_priv oid_rtl_seg_03_00[] =
@@ -14230,11 +14218,11 @@ index 000000000000..31b4704d4347
+ {1, &oid_null_function}, //0x03
+ {1, &oid_rt_set_default_key_id_hdl}, //0x04
+
-+
++
+};
+
+
-+//************** oid_rtl_seg_01_01 section start **************
++//************** oid_rtl_seg_01_01 section start **************
+
+NDIS_STATUS oid_rt_pro_set_fw_dig_state_hdl(struct oid_par_priv* poid_par_priv)
+{
@@ -14242,28 +14230,28 @@ index 000000000000..31b4704d4347
+#if 0
+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
+ _irqL oldirql;
-+
++
+ _func_enter_;
-+
-+ if(poid_par_priv->type_of_oid != SET_OID)
++
++ if(poid_par_priv->type_of_oid != SET_OID)
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
+ }
-+
++
+ _irqlevel_changed_(&oldirql,LOWER);
+ if(poid_par_priv->information_buf_len >= sizeof(struct setdig_parm))
+ {
-+ //DEBUG_ERR(("===> oid_rt_pro_set_fw_dig_state_hdl. type:0x%02x.\n",*((unsigned char*)poid_par_priv->information_buf )));
-+ if(!rtw_setfwdig_cmd(Adapter,*((unsigned char*)poid_par_priv->information_buf )))
++ //DEBUG_ERR(("===> oid_rt_pro_set_fw_dig_state_hdl. type:0x%02x.\n",*((unsigned char*)poid_par_priv->information_buf )));
++ if(!rtw_setfwdig_cmd(Adapter,*((unsigned char*)poid_par_priv->information_buf )))
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ }
-+
++
+ }
+ else{
+ status = NDIS_STATUS_NOT_ACCEPTED;
-+ }
++ }
+ _irqlevel_changed_(&oldirql,RAISE);
+ _func_exit_;
+#endif
@@ -14277,29 +14265,29 @@ index 000000000000..31b4704d4347
+#if 0
+ PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
+ _irqL oldirql;
-+
-+ _func_enter_;
-+ if(poid_par_priv->type_of_oid != SET_OID)
++
++ _func_enter_;
++ if(poid_par_priv->type_of_oid != SET_OID)
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
+ }
+
-+
++
+ _irqlevel_changed_(&oldirql,LOWER);
-+
++
+ if(poid_par_priv->information_buf_len >= sizeof(struct setra_parm))
+ {
-+ //DEBUG_ERR(("===> oid_rt_pro_set_fw_ra_state_hdl. type:0x%02x.\n",*((unsigned char*)poid_par_priv->information_buf )));
-+ if(!rtw_setfwra_cmd(Adapter,*((unsigned char*)poid_par_priv->information_buf )))
++ //DEBUG_ERR(("===> oid_rt_pro_set_fw_ra_state_hdl. type:0x%02x.\n",*((unsigned char*)poid_par_priv->information_buf )));
++ if(!rtw_setfwra_cmd(Adapter,*((unsigned char*)poid_par_priv->information_buf )))
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ }
-+
++
+ }
+ else{
+ status = NDIS_STATUS_NOT_ACCEPTED;
-+ }
++ }
+ _irqlevel_changed_(&oldirql,RAISE);
+ _func_exit_;
+#endif
@@ -14316,7 +14304,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+#if 0
+ if(pMgntInfo->mAssoc || pMgntInfo->mIbss)
@@ -14345,12 +14333,12 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
-+
++ }
++
+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) )
-+ {
++ {
+ *(ULONG *)poid_par_priv->information_buf = padapter->recvpriv.rx_smallpacket_crcerr;
-+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
++ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
+ else
+ {
@@ -14369,12 +14357,12 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) )
-+ {
++ {
+ *(ULONG *)poid_par_priv->information_buf = padapter->recvpriv.rx_middlepacket_crcerr;
-+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
++ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
+ else
+ {
@@ -14394,12 +14382,12 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) )
-+ {
++ {
+ *(ULONG *)poid_par_priv->information_buf = padapter->recvpriv.rx_largepacket_crcerr;
-+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
++ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
+ else
+ {
@@ -14420,7 +14408,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14433,7 +14421,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ return status;
+}
@@ -14447,11 +14435,11 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+ if(poid_par_priv->information_buf_len >= sizeof(ULONG) )
-+ {
++ {
+ *(u64 *)poid_par_priv->information_buf = padapter->recvpriv.rx_pkts + padapter->recvpriv.rx_drop;
-+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
++ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
+ else
+ {
@@ -14471,7 +14459,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14484,7 +14472,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14509,7 +14497,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_INVALID_LENGTH ;
+ }
-+
++
+
+ return status;
+}
@@ -14523,7 +14511,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14532,23 +14520,23 @@ index 000000000000..31b4704d4347
+{
+ NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
-+ ULONG preamblemode = 0 ;
-+
++ ULONG preamblemode = 0 ;
++
+ if(poid_par_priv->type_of_oid != QUERY_OID)
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+ if(poid_par_priv->information_buf_len>= sizeof(ULONG))
-+ {
++ {
+ if(padapter->registrypriv.preamble == PREAMBLE_LONG)
+ preamblemode = 0;
+ else if (padapter->registrypriv.preamble == PREAMBLE_AUTO)
+ preamblemode = 1;
+ else if (padapter->registrypriv.preamble == PREAMBLE_SHORT)
+ preamblemode = 2;
-+
-+
++
++
+ *(ULONG *)poid_par_priv->information_buf = preamblemode ;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
@@ -14568,7 +14556,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14577,13 +14565,13 @@ index 000000000000..31b4704d4347
+{
+ NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
-+ struct eeprom_priv* peeprompriv = &padapter->eeprompriv;
++ struct eeprom_priv* peeprompriv = &padapter->eeprompriv;
+
+ if(poid_par_priv->type_of_oid != QUERY_OID)
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ *(u16 *)poid_par_priv->information_buf = peeprompriv->channel_plan ;
+
@@ -14593,14 +14581,14 @@ index 000000000000..31b4704d4347
+{
+ NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
-+ struct eeprom_priv* peeprompriv = &padapter->eeprompriv;
-+
++ struct eeprom_priv* peeprompriv = &padapter->eeprompriv;
++
+ if(poid_par_priv->type_of_oid != SET_OID)
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
-+
++ }
++
+ peeprompriv->channel_plan = *(u16 *)poid_par_priv->information_buf ;
+
+ return status;
@@ -14616,24 +14604,24 @@ index 000000000000..31b4704d4347
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
+ }
-+
++
+ if(poid_par_priv->information_buf_len>= sizeof(ULONG))
-+ {
++ {
+ preamblemode = *(ULONG *)poid_par_priv->information_buf ;
+ if( preamblemode == 0)
+ padapter->registrypriv.preamble = PREAMBLE_LONG;
+ else if (preamblemode==1 )
+ padapter->registrypriv.preamble = PREAMBLE_AUTO;
+ else if ( preamblemode==2 )
-+ padapter->registrypriv.preamble = PREAMBLE_SHORT;
-+
++ padapter->registrypriv.preamble = PREAMBLE_SHORT;
++
+ *(ULONG *)poid_par_priv->information_buf = preamblemode ;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
+ else
+ {
+ status = NDIS_STATUS_INVALID_LENGTH ;
-+ }
++ }
+
+ return status;
+}
@@ -14668,9 +14656,9 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+ if(poid_par_priv->information_buf_len>= sizeof(ULONG))
-+ {
++ {
+ *(u64 *)poid_par_priv->information_buf = padapter->xmitpriv.tx_bytes;
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
@@ -14678,7 +14666,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_INVALID_LENGTH ;
+ }
-+
++
+
+ return status;
+}
@@ -14722,7 +14710,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14735,7 +14723,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14753,7 +14741,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ if ( (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) ||
+ (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE))
@@ -14763,7 +14751,7 @@ index 000000000000..31b4704d4347
+
+ channelnum = pnic_Config->DSConfig;
+ *(ULONG *)poid_par_priv->information_buf = channelnum;
-+
++
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+
+ _func_exit_;
@@ -14781,7 +14769,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14794,7 +14782,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14803,24 +14791,24 @@ index 000000000000..31b4704d4347
+ NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
+ ULONG ulInfo = 0 ;
-+ //DEBUG_ERR(("<**********************oid_rt_supported_wireless_mode_hdl \n"));
++ //DEBUG_ERR(("<**********************oid_rt_supported_wireless_mode_hdl \n"));
+ if(poid_par_priv->type_of_oid != QUERY_OID)
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+ if(poid_par_priv->information_buf_len >= sizeof(ULONG)){
+ ulInfo |= 0x0100; //WIRELESS_MODE_B
+ ulInfo |= 0x0200; //WIRELESS_MODE_G
+ ulInfo |= 0x0400; //WIRELESS_MODE_A
+
-+ *(ULONG *) poid_par_priv->information_buf = ulInfo;
-+ //DEBUG_ERR(("<===oid_rt_supported_wireless_mode %x\n",ulInfo));
++ *(ULONG *) poid_par_priv->information_buf = ulInfo;
++ //DEBUG_ERR(("<===oid_rt_supported_wireless_mode %x\n",ulInfo));
+ *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
+ }
+ else{
+ status = NDIS_STATUS_INVALID_LENGTH;
-+ }
++ }
+
+ return status;
+}
@@ -14833,7 +14821,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14846,7 +14834,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14875,7 +14863,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14887,9 +14875,9 @@ index 000000000000..31b4704d4347
+
+ return status;
+}
-+//************** oid_rtl_seg_01_01 section end **************
++//************** oid_rtl_seg_01_01 section end **************
+
-+//************** oid_rtl_seg_01_03 section start **************
++//************** oid_rtl_seg_01_03 section start **************
+NDIS_STATUS oid_rt_ap_get_associated_station_list_hdl(struct oid_par_priv* poid_par_priv)
+{
+ NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@@ -14899,7 +14887,7 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
@@ -14926,12 +14914,12 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ return status;
+}
+
-+//************** oid_rtl_seg_01_03 section end **************
++//************** oid_rtl_seg_01_03 section end **************
+
+//**************** oid_rtl_seg_01_11 section start ****************
+NDIS_STATUS oid_rt_pro_rf_write_registry_hdl(struct oid_par_priv* poid_par_priv)
@@ -14946,27 +14934,27 @@ index 000000000000..31b4704d4347
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
+ }
-+
++
+ _irqlevel_changed_(&oldirql,LOWER);
+ if(poid_par_priv->information_buf_len== (sizeof(unsigned long)*3))
-+ {
++ {
+ //RegOffsetValue - The offset of RF register to write.
+ //RegDataWidth - The data width of RF register to write.
-+ //RegDataValue - The value to write.
++ //RegDataValue - The value to write.
+ //RegOffsetValue = *((unsigned long*)InformationBuffer);
-+ //RegDataWidth = *((unsigned long*)InformationBuffer+1);
-+ //RegDataValue = *((unsigned long*)InformationBuffer+2);
-+ if(!rtw_setrfreg_cmd(Adapter,
-+ *(unsigned char*)poid_par_priv->information_buf,
++ //RegDataWidth = *((unsigned long*)InformationBuffer+1);
++ //RegDataValue = *((unsigned long*)InformationBuffer+2);
++ if(!rtw_setrfreg_cmd(Adapter,
++ *(unsigned char*)poid_par_priv->information_buf,
+ (unsigned long)(*((unsigned long*)poid_par_priv->information_buf+2))))
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ }
-+
++
+ }
+ else{
+ status = NDIS_STATUS_INVALID_LENGTH;
-+ }
++ }
+ _irqlevel_changed_(&oldirql,RAISE);
+ _func_exit_;
+
@@ -14987,8 +14975,8 @@ index 000000000000..31b4704d4347
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
-+
++ }
++
+ _irqlevel_changed_(&oldirql,LOWER);
+ if(poid_par_priv->information_buf_len== (sizeof(unsigned long)*3))
+ {
@@ -15002,24 +14990,24 @@ index 000000000000..31b4704d4347
+ Adapter->mppriv.act_in_progress = _TRUE;
+ Adapter->mppriv.workparam.bcompleted= _FALSE;
+ Adapter->mppriv.workparam.act_type = MPT_READ_RF;
-+ Adapter->mppriv.workparam.io_offset = *(unsigned long*)poid_par_priv->information_buf;
++ Adapter->mppriv.workparam.io_offset = *(unsigned long*)poid_par_priv->information_buf;
+ Adapter->mppriv.workparam.io_value = 0xcccccccc;
-+
++
+ //RegOffsetValue - The offset of RF register to read.
+ //RegDataWidth - The data width of RF register to read.
-+ //RegDataValue - The value to read.
++ //RegDataValue - The value to read.
+ //RegOffsetValue = *((unsigned long*)InformationBuffer);
-+ //RegDataWidth = *((unsigned long*)InformationBuffer+1);
-+ //RegDataValue = *((unsigned long*)InformationBuffer+2);
-+ if(!rtw_getrfreg_cmd(Adapter,
-+ *(unsigned char*)poid_par_priv->information_buf,
++ //RegDataWidth = *((unsigned long*)InformationBuffer+1);
++ //RegDataValue = *((unsigned long*)InformationBuffer+2);
++ if(!rtw_getrfreg_cmd(Adapter,
++ *(unsigned char*)poid_par_priv->information_buf,
+ (unsigned char*)&Adapter->mppriv.workparam.io_value))
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ }
+ }
-+
-+
++
++
+ }
+ else {
+ status = NDIS_STATUS_INVALID_LENGTH;
@@ -15030,10 +15018,10 @@ index 000000000000..31b4704d4347
+ return status;
+}
+
-+//**************** oid_rtl_seg_01_11 section end****************
++//**************** oid_rtl_seg_01_11 section end****************
+
+
-+//************** oid_rtl_seg_03_00 section start **************
++//************** oid_rtl_seg_03_00 section start **************
+enum _CONNECT_STATE_{
+ CHECKINGSTATUS,
+ ASSOCIATED,
@@ -15049,21 +15037,21 @@ index 000000000000..31b4704d4347
+ struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+
+ ULONG ulInfo;
-+
++
+ if(poid_par_priv->type_of_oid != QUERY_OID)
+ {
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
-+ }
++ }
+
+ // nStatus==0 CheckingStatus
+ // nStatus==1 Associated
+ // nStatus==2 AdHocMode
+ // nStatus==3 NotAssociated
-+
++
+ if(check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE)
+ ulInfo = CHECKINGSTATUS;
-+ else if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
++ else if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
+ ulInfo = ASSOCIATED;
+ else if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)== _TRUE)
+ ulInfo = ADHOCMODE;
@@ -15101,20 +15089,20 @@ index 000000000000..31b4704d4347
+ status = NDIS_STATUS_NOT_ACCEPTED;
+ return status;
+ }
-+
++
+ return status;
+}
-+//************** oid_rtl_seg_03_00 section end **************
++//************** oid_rtl_seg_03_00 section end **************
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c
new file mode 100755
-index 000000000000..564ff6eaebec
+index 000000000000..bf800ddf6681
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c
-@@ -0,0 +1,1494 @@
+@@ -0,0 +1,1493 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -15163,7 +15151,7 @@ index 000000000000..564ff6eaebec
+ if (is_zero_mac_addr(bssid)
+ || is_broadcast_mac_addr(bssid)
+ || is_multicast_mac_addr(bssid)
-+ ) {
++ ) {
+ ret = _FALSE;
+ }
+
@@ -15175,7 +15163,7 @@ index 000000000000..564ff6eaebec
+ u8 i;
+ u8 ret=_TRUE;
+
-+_func_enter_;
++_func_enter_;
+
+ if (ssid->SsidLength > 32) {
+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n"));
@@ -15195,7 +15183,7 @@ index 000000000000..564ff6eaebec
+ }
+#endif /* CONFIG_VALIDATE_SSID */
+
-+exit:
++exit:
+
+_func_exit_;
+
@@ -15221,7 +15209,7 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("\n rtw_do_join: phead = %p; plist = %p \n\n\n", phead, plist));
+
+ pmlmepriv->cur_network.join_res = -2;
-+
++
+ set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
+
+ pmlmepriv->pscanned = plist;
@@ -15229,13 +15217,13 @@ index 000000000000..564ff6eaebec
+ pmlmepriv->to_join = _TRUE;
+
+ if(_rtw_queue_empty(queue)== _TRUE)
-+ {
++ {
+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
-+
++
+ //when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty
-+ //we try to issue sitesurvey firstly
-+
++ //we try to issue sitesurvey firstly
++
+ if (pmlmepriv->LinkDetectInfo.bBusyTraffic ==_FALSE
+ || rtw_to_roaming(padapter) > 0
+ )
@@ -15246,10 +15234,10 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_do_join(): site survey return error\n."));
+ }
+ }
-+
++
+ goto exit;
-+ }
-+ else
++ }
++ else
+ {
+ int select_ret;
+ _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
@@ -15264,60 +15252,60 @@ index 000000000000..564ff6eaebec
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
+ rtw_indicate_connect(padapter);
+ }
-+ else
++ else
+ {
+ if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE)
+ {
+ // submit createbss_cmd to change to a ADHOC_MASTER
+
-+ //pmlmepriv->lock has been acquired by caller...
++ //pmlmepriv->lock has been acquired by caller...
+ WLAN_BSSID_EX *pdev_network = &(padapter->registrypriv.dev_network);
+
+ pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
-+
++
+ pibss = padapter->registrypriv.dev_network.MacAddress;
+
+ _rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
+ _rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
-+
++
+ rtw_update_registrypriv_dev_network(padapter);
+
+ rtw_generate_random_ibss(pibss);
-+
++
+ if(rtw_createbss_cmd(padapter)!=_SUCCESS)
+ {
-+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n "));
++ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n "));
+ ret = _FALSE;
+ goto exit;
+ }
+
-+ pmlmepriv->to_join = _FALSE;
++ pmlmepriv->to_join = _FALSE;
+
-+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n "));
++ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n "));
+
-+ }
++ }
+ else
-+ {
-+ // can't associate ; reset under-linking
++ {
++ // can't associate ; reset under-linking
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
+
-+#if 0
++#if 0
+ if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE))
+ {
+ if(_rtw_memcmp(pmlmepriv->cur_network.network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength))
-+ {
++ {
+ // for funk to do roaming
+ // funk will reconnect, but funk will not sitesurvey before reconnect
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("for funk to do roaming"));
+ if(pmlmepriv->sitesurveyctrl.traffic_busy==_FALSE)
+ rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0);
+ }
-+
-+ }
++
++ }
+#endif
+
+ //when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue
-+ //we try to issue sitesurvey firstly
++ //we try to issue sitesurvey firstly
+ if(pmlmepriv->LinkDetectInfo.bBusyTraffic==_FALSE
+ || rtw_to_roaming(padapter) > 0
+ )
@@ -15326,7 +15314,7 @@ index 000000000000..564ff6eaebec
+ if( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ){
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n."));
+ }
-+ }
++ }
+
+
+ }
@@ -15334,12 +15322,12 @@ index 000000000000..564ff6eaebec
+ }
+
+ }
-+
++
+exit:
-+
-+_func_exit_;
+
-+ return ret;
++_func_exit_;
++
++ return ret;
+}
+
+#ifdef PLATFORM_WINDOWS
@@ -15350,20 +15338,20 @@ index 000000000000..564ff6eaebec
+_func_enter_;
+
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("==>rtw_pnp_set_power_wakeup!!!\n"));
-+
++
+ res = rtw_setstandby_cmd(padapter, 0);
+
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("<==rtw_pnp_set_power_wakeup!!!\n"));
+
+_func_exit_;
-+
++
+ return res;
+}
+
+u8 rtw_pnp_set_power_sleep(_adapter* padapter)
+{
-+ u8 res=_SUCCESS;
-+
++ u8 res=_SUCCESS;
++
+_func_enter_;
+
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("==>rtw_pnp_set_power_sleep!!!\n"));
@@ -15393,18 +15381,18 @@ index 000000000000..564ff6eaebec
+ // 8711 CAM was not for En/Decrypt only
+ // so, we can't clear all keys.
+ // should we disable WPAcfg (ox0088) bit 1-2, instead of clear all CAM
-+
++
+ //TO DO...
+
+_func_exit_;
-+
++
+ return _TRUE;
+}
+
+u8 set_802_11_test(_adapter* padapter, NDIS_802_11_TEST *test)
+{
+ u8 ret=_TRUE;
-+
++
+_func_enter_;
+
+ switch(test->Type)
@@ -15426,7 +15414,7 @@ index 000000000000..564ff6eaebec
+
+_func_exit_;
+
-+ return ret;
++ return ret;
+}
+
+u8 rtw_set_802_11_pmkid(_adapter* padapter, NDIS_802_11_PMKID *pmkid)
@@ -15439,15 +15427,15 @@ index 000000000000..564ff6eaebec
+#endif
+
+u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid)
-+{
-+ _irqL irqL;
++{
++ _irqL irqL;
+ u8 status=_SUCCESS;
+ u32 cur_time = 0;
+
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
-+
++
+_func_enter_;
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
+ ("+rtw_set_802_11_bssid: bssid="MAC_FMT"\n", MAC_ARG(bssid) ));
+
@@ -15457,7 +15445,7 @@ index 000000000000..564ff6eaebec
+ status = _FAIL;
+ goto exit;
+ }
-+
++
+ _enter_critical_bh(&pmlmepriv->lock, &irqL);
+
+
@@ -15473,7 +15461,7 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n"));
+
+ if (_rtw_memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, ETH_ALEN) == _TRUE)
-+ {
++ {
+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _FALSE)
+ goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again.
+ } else {
@@ -15491,7 +15479,7 @@ index 000000000000..564ff6eaebec
+ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) {
+ _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
-+ }
++ }
+ }
+ }
+
@@ -15505,7 +15493,7 @@ index 000000000000..564ff6eaebec
+ pmlmepriv->assoc_by_bssid=_TRUE;
+
+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
-+ pmlmepriv->to_join = _TRUE;
++ pmlmepriv->to_join = _TRUE;
+ }
+ else {
+ status = rtw_do_join(padapter);
@@ -15513,27 +15501,27 @@ index 000000000000..564ff6eaebec
+
+release_mlme_lock:
+ _exit_critical_bh(&pmlmepriv->lock, &irqL);
-+
++
+exit:
+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+ ("rtw_set_802_11_bssid: status=%d\n", status));
-+
++
+_func_exit_;
+
+ return status;
+}
+
+u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid)
-+{
++{
+ _irqL irqL;
+ u8 status = _SUCCESS;
+ u32 cur_time = 0;
+
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ struct wlan_network *pnetwork = &pmlmepriv->cur_network;
-+
++
+_func_enter_;
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
+ ("+rtw_set_802_11_ssid: ssid=[%s] fw_state=0x%08x\n",
+ ssid->Ssid, get_fwstate(pmlmepriv)));
@@ -15544,11 +15532,11 @@ index 000000000000..564ff6eaebec
+ status = _FAIL;
+ goto exit;
+ }
-+
++
+ _enter_critical_bh(&pmlmepriv->lock, &irqL);
+
+ DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
-+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
++ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
+ goto handle_tkip_countermeasure;
+ } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) {
+ goto release_mlme_lock;
@@ -15561,7 +15549,7 @@ index 000000000000..564ff6eaebec
+
+ if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) &&
+ (_rtw_memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength) == _TRUE))
-+ {
++ {
+ if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _FALSE))
+ {
+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
@@ -15569,13 +15557,13 @@ index 000000000000..564ff6eaebec
+ get_fwstate(pmlmepriv)));
+
+ if(rtw_is_same_ibss(padapter, pnetwork) == _FALSE)
-+ {
++ {
+ //if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again
+ rtw_disassoc_cmd(padapter, 0, _TRUE);
+
+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
+ rtw_indicate_disconnect(padapter);
-+
++
+ rtw_free_assoc_resources(padapter, 1);
+
+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) {
@@ -15604,14 +15592,14 @@ index 000000000000..564ff6eaebec
+
+ if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
+ rtw_indicate_disconnect(padapter);
-+
++
+ rtw_free_assoc_resources(padapter, 1);
+
+ if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) {
+ _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
+ }
-+ }
++ }
+ }
+
+handle_tkip_countermeasure:
@@ -15629,7 +15617,7 @@ index 000000000000..564ff6eaebec
+ pmlmepriv->assoc_by_bssid=_FALSE;
+
+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
-+ pmlmepriv->to_join = _TRUE;
++ pmlmepriv->to_join = _TRUE;
+ }
+ else {
+ status = rtw_do_join(padapter);
@@ -15641,11 +15629,11 @@ index 000000000000..564ff6eaebec
+exit:
+ RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+ ("-rtw_set_802_11_ssid: status=%d\n", status));
-+
++
+_func_exit_;
+
+ return status;
-+
++
+}
+
+u8 rtw_set_802_11_connect(_adapter *padapter, const u8 *bssid, NDIS_802_11_SSID *ssid)
@@ -15705,7 +15693,7 @@ index 000000000000..564ff6eaebec
+ }
+
+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
-+ pmlmepriv->to_join = _TRUE;
++ pmlmepriv->to_join = _TRUE;
+ }
+ else {
+ status = rtw_do_join(padapter);
@@ -15715,7 +15703,7 @@ index 000000000000..564ff6eaebec
+ _exit_critical_bh(&pmlmepriv->lock, &irqL);
+
+exit:
-+
++
+_func_exit_;
+
+ return status;
@@ -15726,35 +15714,35 @@ index 000000000000..564ff6eaebec
+ ### NOTE:#### (!!!!)
+ MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock and scanned_queue->lock in sequence
+*/
-+u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter,
++u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter,
+ NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
+{
+ _irqL irqL;
+ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+ struct wlan_network *cur_network = &pmlmepriv->cur_network;
+ NDIS_802_11_NETWORK_INFRASTRUCTURE* pold_state = &(cur_network->network.InfrastructureMode);
-+
++++
+_func_enter_;
+
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_notice_,
+ ("+rtw_set_802_11_infrastructure_mode: old=%d new=%d fw_state=0x%08x\n",
+ *pold_state, networktype, get_fwstate(pmlmepriv)));
-+
++++
+ if(*pold_state != networktype)
+ {
-+
++++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,(" change mode!"));
+ //DBG_871X("change mode, old_mode=%d, new_mode=%d, fw_state=0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv));
+ +
+ if(*pold_state==Ndis802_11APMode)
-+ {
-+ //change to other mode from Ndis802_11APMode
++ {
++ //change to other mode from Ndis802_11APMode
+ cur_network->join_res = -1;
-+
++
+#ifdef CONFIG_NATIVEAP_MLME
+ stop_ap_mode(padapter);
+#endif
-+ }
++ }
+
+ if((check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) ||(*pold_state==Ndis802_11IBSS))
+ rtw_disassoc_cmd(padapter, 0, _TRUE);
@@ -15766,7 +15754,7 @@ index 000000000000..564ff6eaebec
+ if((*pold_state == Ndis802_11Infrastructure) ||(*pold_state == Ndis802_11IBSS))
+ {
+ if(check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
-+ {
++ {
+ rtw_indicate_disconnect(padapter); //will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not
+ }
+ }
@@ -15774,33 +15762,33 @@ index 000000000000..564ff6eaebec
+ *pold_state = networktype;
+
+ _clr_fwstate_(pmlmepriv, ~WIFI_NULL_STATE);
-+
++
+ switch(networktype)
+ {
+ case Ndis802_11IBSS:
+ set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
+ break;
-+
++
+ case Ndis802_11Infrastructure:
+ set_fwstate(pmlmepriv, WIFI_STATION_STATE);
+ break;
-+
++
+ case Ndis802_11APMode:
+ set_fwstate(pmlmepriv, WIFI_AP_STATE);
+#ifdef CONFIG_NATIVEAP_MLME
+ start_ap_mode(padapter);
+ //rtw_indicate_connect(padapter);
-+#endif
-+
++#endif
++
+ break;
+
+ case Ndis802_11AutoUnknown:
+ case Ndis802_11InfrastructureMax:
-+ break;
++ break;
+ }
+
+ //SecClearAllKeys(adapter);
-+
++
+ //RT_TRACE(COMP_OID_SET, DBG_LOUD, ("set_infrastructure: fw_state:%x after changing mode\n",
+ // get_fwstate(pmlmepriv) ));
+
@@ -15832,18 +15820,18 @@ index 000000000000..564ff6eaebec
+ }
+
+ _exit_critical_bh(&pmlmepriv->lock, &irqL);
-+
++
+_func_exit_;
+
-+ return _TRUE;
++ return _TRUE;
+}
+
+u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
-+{
++{
+ _irqL irqL;
+ struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
+ u8 res=_TRUE;
-+
++
+_func_enter_;
+
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("+rtw_set_802_11_bssid_list_scan(), fw_state=%x\n", get_fwstate(pmlmepriv)));
@@ -15857,7 +15845,7 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n===rtw_set_802_11_bssid_list_scan:hw_init_completed==_FALSE===\n"));
+ goto exit;
+ }
-+
++
+ if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) ||
+ (pmlmepriv->LinkDetectInfo.bBusyTraffic == _TRUE))
+ {
@@ -15870,50 +15858,50 @@ index 000000000000..564ff6eaebec
+ } else {
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###pmlmepriv->sitesurveyctrl.traffic_busy==_TRUE\n\n"));
+ }
-+ } else {
++ } else {
+ if (rtw_is_scan_deny(padapter)) {
+ DBG_871X(FUNC_ADPT_FMT": scan deny\n", FUNC_ADPT_ARG(padapter));
+ indicate_wx_scan_complete_event(padapter);
+ return _SUCCESS;
+ }
-+
-+ _enter_critical_bh(&pmlmepriv->lock, &irqL);
-+
++
++ _enter_critical_bh(&pmlmepriv->lock, &irqL);
++
+ res = rtw_sitesurvey_cmd(padapter, pssid, ssid_max_num, NULL, 0);
-+
++
+ _exit_critical_bh(&pmlmepriv->lock, &irqL);
+ }
+exit:
-+
++
+_func_exit_;
+
-+ return res;
++ return res;
+}
+
-+u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
++u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
+{
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
+ int res;
+ u8 ret;
-+
++
+_func_enter_;
+
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_802_11_auth.mode(): mode=%x\n", authmode));
+
+ psecuritypriv->ndisauthtype=authmode;
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_authentication_mode:psecuritypriv->ndisauthtype=%d", psecuritypriv->ndisauthtype));
-+
++
+ if(psecuritypriv->ndisauthtype>3)
+ psecuritypriv->dot11AuthAlgrthm=dot11AuthAlgrthm_8021X;
-+
++
+ res=rtw_set_auth(padapter,psecuritypriv);
-+
++
+ if(res==_SUCCESS)
+ ret=_TRUE;
+ else
+ ret=_FALSE;
-+
++
+_func_exit_;
+
+ return ret;
@@ -15939,7 +15927,7 @@ index 000000000000..564ff6eaebec
+ ret=_FALSE;
+ goto exit;
+ }
-+
++
+ switch(wep->KeyLength)
+ {
+ case 5:
@@ -15955,7 +15943,7 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_add_wep:wep->KeyLength!=5 or 13\n"));
+ break;
+ }
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:befor memcpy, wep->KeyLength=0x%x wep->KeyIndex=0x%x keyid =%x\n",wep->KeyLength,wep->KeyIndex,keyid));
+
+ _rtw_memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]),&(wep->KeyMaterial),wep->KeyLength);
@@ -15972,58 +15960,58 @@ index 000000000000..564ff6eaebec
+ psecuritypriv->dot11DefKey[keyid].skey[12]));
+
+ res=rtw_set_key(padapter,psecuritypriv, keyid, 1);
-+
++
+ if(res==_FAIL)
+ ret= _FALSE;
+exit:
-+
++
+_func_exit_;
+
+ return ret;
-+
++
+}
+
+u8 rtw_set_802_11_remove_wep(_adapter* padapter, u32 keyindex){
-+
++
+ u8 ret=_SUCCESS;
-+
++
+_func_enter_;
+
+ if (keyindex >= 0x80000000 || padapter == NULL){
-+
++
+ ret=_FALSE;
+ goto exit;
+
+ }
-+ else
++ else
+ {
+ int res;
+ struct security_priv* psecuritypriv=&(padapter->securitypriv);
+ if( keyindex < 4 ){
-+
++
+ _rtw_memset(&psecuritypriv->dot11DefKey[keyindex], 0, 16);
-+
++
+ res=rtw_set_key(padapter,psecuritypriv,keyindex, 0);
-+
++
+ psecuritypriv->dot11DefKeylen[keyindex]=0;
-+
++
+ if(res==_FAIL)
+ ret=_FAIL;
-+
++
+ }
+ else
-+ {
++ {
+ ret=_FAIL;
+ }
-+
++
+ }
-+
-+exit:
-+
++
++exit:
++
+_func_exit_;
+
+ return ret;
-+
++
+}
+
+u8 rtw_set_802_11_add_key(_adapter* padapter, NDIS_802_11_KEY *key){
@@ -16034,12 +16022,12 @@ index 000000000000..564ff6eaebec
+ u8 bgroup = _FALSE;
+ u8 bgrouptkey = _FALSE;//can be remove later
+ u8 ret=_SUCCESS;
-+
++
+_func_enter_;
+
+ if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)){
+
-+ // It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination,
++ // It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination,
+ // it must fail the request and return NDIS_STATUS_INVALID_DATA.
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000) == 0)[=%d] ",(int)(key->KeyIndex & 0x80000000) == 0));
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000) > 0)[=%d]" , (int)(key->KeyIndex & 0x40000000) > 0));
@@ -16049,11 +16037,11 @@ index 000000000000..564ff6eaebec
+ }
+
+ if(key->KeyIndex & 0x40000000)
-+ {
++ {
+ // Pairwise key
+
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ Pairwise key +++++\n"));
-+
++
+ pbssid=get_bssid(&padapter->mlmepriv);
+ stainfo=rtw_get_stainfo(&padapter->stapriv, pbssid);
+
@@ -16073,7 +16061,7 @@ index 000000000000..564ff6eaebec
+ if((stainfo!=NULL)){
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (stainfo->dot118021XPrivacy ==%d)!\n", stainfo->dot118021XPrivacy));
+ }
-+
++
+ if(key->KeyIndex & 0x000000FF){
+ // The key index is specified in the lower 8 bits by values of zero to 255.
+ // The key index should be set to zero for a Pairwise key, and the driver should fail with
@@ -16104,7 +16092,7 @@ index 000000000000..564ff6eaebec
+ if((encryptionalgo== _AES_)&& (key->KeyLength != 16)) {
+ // For our supplicant, EAPPkt9x.vxd, cannot differentiate TKIP and AES case.
+ if(key->KeyLength == 32) {
-+ key->KeyLength = 16;
++ key->KeyLength = 16;
+ } else {
+ ret= _FAIL;
+ goto exit;
@@ -16127,10 +16115,10 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key index: 0x%8x(0x%8x)\n", key->KeyIndex,(key->KeyIndex&0x3)));
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key Length: %d\n", key->KeyLength));
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n"));
-+
++
+ }
-+ else
-+ {
++ else
++ {
+ // Group key - KeyIndex(BIT30==0)
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ Group key +++++\n"));
+
@@ -16155,19 +16143,19 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u \n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength));
+ break;
+ }
-+
++
+ encryptionalgo=padapter->securitypriv.dot11PrivacyAlgrthm;
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" Adapter->securitypriv.dot11PrivacyAlgrthm=%x\n", padapter->securitypriv.dot11PrivacyAlgrthm));
-+
++
+ }
-+ else
++ else
+ {
+ encryptionalgo=padapter->securitypriv.dot118021XGrpPrivacy;
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("( Adapter->securitypriv.dot11PrivacyAlgrthm=%x )encryptionalgo(%x)=padapter->securitypriv.dot118021XGrpPrivacy(%x)keylen=%d\n", padapter->securitypriv.dot11PrivacyAlgrthm,encryptionalgo,padapter->securitypriv.dot118021XGrpPrivacy,key->KeyLength));
+
+ }
-+
++
+ if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==_TRUE) && (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == _FALSE)) {
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" IBSS but BSSID is not Broadcast Address.\n"));
+ ret= _FAIL;
@@ -16182,7 +16170,7 @@ index 000000000000..564ff6eaebec
+ goto exit;
+
+ } else if(encryptionalgo== _AES_ && (key->KeyLength != 16 && key->KeyLength != 32) ) {
-+
++
+ // Check key length for AES
+ // For NDTEST, we allow keylen=32 in this case. 2005.01.27, by rcnjko.
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("<=== SetInfo, OID_802_11_ADD_KEY: AES GTK KeyLength:%u != 16 or 32\n", key->KeyLength));
@@ -16192,7 +16180,7 @@ index 000000000000..564ff6eaebec
+
+ // Change the key length for EAPPkt9x.vxd. Added by Annie, 2005-11-03.
+ if((encryptionalgo== _AES_) && (key->KeyLength == 32) ) {
-+ key->KeyLength = 16;
++ key->KeyLength = 16;
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("AES key length changed: %u\n", key->KeyLength) );
+ }
+
@@ -16213,36 +16201,36 @@ index 000000000000..564ff6eaebec
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key index: 0x%8x(0x%8x)\n", key->KeyIndex,(key->KeyIndex&0x3)));
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key Length: %d\n", key->KeyLength)) ;
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n"));
-+
-+ }
++
++ }
+
+ // If WEP encryption algorithm, just call rtw_set_802_11_add_wep().
+ if((padapter->securitypriv.dot11AuthAlgrthm !=dot11AuthAlgrthm_8021X)&&(encryptionalgo== _WEP40_ || encryptionalgo== _WEP104_))
+ {
-+ u8 ret;
-+ u32 keyindex;
++ u8 ret;
++ u32 keyindex;
+ u32 len = FIELD_OFFSET(NDIS_802_11_KEY, KeyMaterial) + key->KeyLength;
+ NDIS_802_11_WEP *wep = &padapter->securitypriv.ndiswep;
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ WEP key +++++\n"));
+
+ wep->Length = len;
+ keyindex = key->KeyIndex&0x7fffffff;
+ wep->KeyIndex = keyindex ;
+ wep->KeyLength = key->KeyLength;
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy \n"));
+
-+ _rtw_memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength);
++ _rtw_memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength);
+ _rtw_memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength);
+
-+ padapter->securitypriv.dot11DefKeylen[keyindex]=key->KeyLength;
++ padapter->securitypriv.dot11DefKeylen[keyindex]=key->KeyLength;
+ padapter->securitypriv.dot11PrivacyKeyIndex=keyindex;
-+
++
+ ret = rtw_set_802_11_add_wep(padapter, wep);
-+
++
+ goto exit;
-+
++
+ }
+
+ if(key->KeyIndex & 0x20000000){
@@ -16251,14 +16239,14 @@ index 000000000000..564ff6eaebec
+ if(bgroup == _TRUE)
+ {
+ NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
-+ _rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
-+ }
-+ else
-+ {
-+ NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
-+ _rtw_memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
++ _rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
++ }
++ else
++ {
++ NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
++ _rtw_memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
+ }
-+
++
+ }
+
+ // Indicate this key idx is used for TX
@@ -16266,26 +16254,26 @@ index 000000000000..564ff6eaebec
+ if(bgroup == _TRUE) // Group transmit key
+ {
+ int res;
-+
++
+ if(bgrouptkey == _TRUE)
-+ {
++ {
+ padapter->securitypriv.dot118021XGrpKeyid=(u8)key->KeyIndex;
+ }
-+
++
+ if((key->KeyIndex&0x3) == 0){
+ ret = _FAIL;
+ goto exit;
-+ }
-+
++ }
++
+ _rtw_memset(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
+ _rtw_memset(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
+ _rtw_memset(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
-+
++
+ if((key->KeyIndex & 0x10000000))
+ {
+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3],
@@ -16298,56 +16286,56 @@ index 000000000000..564ff6eaebec
+ {
+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3],
+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[4],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[5],
+ padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[6],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[7]));
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n"));
-+
++
+ }
+
+ //set group key by index
+ _rtw_memcpy(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial, key->KeyLength);
-+
++
+ key->KeyIndex=key->KeyIndex & 0x03;
-+
++
+ padapter->securitypriv.binstallGrpkey=_TRUE;
-+
++
+ padapter->securitypriv.bcheck_grpkey=_FALSE;
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("reset group key"));
-+
++
+ res=rtw_set_key(padapter,&padapter->securitypriv, key->KeyIndex, 1);
+
+ if(res==_FAIL)
+ ret= _FAIL;
+
+ goto exit;
-+
++
+ }
+ else // Pairwise Key
+ {
+ u8 res;
-+
++
+ pbssid=get_bssid(&padapter->mlmepriv);
+ stainfo=rtw_get_stainfo(&padapter->stapriv , pbssid );
-+
++
+ if(stainfo!=NULL)
-+ {
++ {
+ _rtw_memset( &stainfo->dot118021x_UncstKey, 0, 16);// clear keybuffer
-+
++
+ _rtw_memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16);
-+
++
+ if(encryptionalgo== _TKIP_)
+ {
+ padapter->securitypriv.busetkipkey=_FALSE;
-+
++
+ //_set_timer(&padapter->securitypriv.tkip_timer, 50);
-+
++
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n ==========_set_timer\n"));
-+
++
+ // if TKIP, save the Receive/Transmit MIC key in KeyMaterial[128-255]
+ if((key->KeyIndex & 0x10000000)){
+ _rtw_memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 16, 8);
@@ -16358,14 +16346,14 @@ index 000000000000..564ff6eaebec
+ _rtw_memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 16, 8);
+
+ }
-+
++
+ }
+ else if(encryptionalgo == _AES_)
-+ {
-+
++ {
++
+ }
+
-+
++
+ //Set key to CAM through H2C command
+ if(bgrouptkey)//never go to here
+ {
@@ -16376,30 +16364,30 @@ index 000000000000..564ff6eaebec
+ res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, _TRUE);
+ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n"));
+ }
-+
++
+ if(res ==_FALSE)
+ ret= _FAIL;
-+
++
+ }
+
+ }
+
+exit:
-+
++
+_func_exit_;
+
-+ return ret;
++ return ret;
+}
+
+u8 rtw_set_802_11_remove_key(_adapter* padapter, NDIS_802_11_REMOVE_KEY *key){
-+
++
+ uint encryptionalgo;
+ u8 * pbssid;
+ struct sta_info *stainfo;
+ u8 bgroup = (key->KeyIndex & 0x4000000) > 0 ? _FALSE: _TRUE;
+ u8 keyIndex = (u8)key->KeyIndex & 0x03;
+ u8 ret=_SUCCESS;
-+
++
+_func_enter_;
+
+ if ((key->KeyIndex & 0xbffffffc) > 0) {
@@ -16412,13 +16400,13 @@ index 000000000000..564ff6eaebec
+ // clear group key by index
+ //NdisZeroMemory(Adapter->MgntInfo.SecurityInfo.KeyBuf[keyIndex], MAX_WEP_KEY_LEN);
+ //Adapter->MgntInfo.SecurityInfo.KeyLen[keyIndex] = 0;
-+
++
+ _rtw_memset(&padapter->securitypriv.dot118021XGrpKey[keyIndex], 0, 16);
-+
++
+ //! \todo Send a H2C Command to Firmware for removing this Key in CAM Entry.
-+
++
+ } else {
-+
++
+ pbssid=get_bssid(&padapter->mlmepriv);
+ stainfo=rtw_get_stainfo(&padapter->stapriv , pbssid );
+ if(stainfo !=NULL){
@@ -16426,7 +16414,7 @@ index 000000000000..564ff6eaebec
+
+ // clear key by BSSID
+ _rtw_memset(&stainfo->dot118021x_UncstKey, 0, 16);
-+
++
+ //! \todo Send a H2C Command to Firmware for disable this Key in CAM Entry.
+
+ }
@@ -16437,17 +16425,17 @@ index 000000000000..564ff6eaebec
+ }
+
+exit:
-+
++
+_func_exit_;
+
+ return _TRUE;
-+
++
+}
+
+/*
-+* rtw_get_cur_max_rate -
++* rtw_get_cur_max_rate -
+* @adapter: pointer to _adapter structure
-+*
++*
+* Return 0 or 100Kbps
+*/
+u16 rtw_get_cur_max_rate(_adapter *adapter)
@@ -16465,18 +16453,18 @@ index 000000000000..564ff6eaebec
+ u8 rf_type = 0;
+ u8 bw_40MHz=0, short_GI_20=0, short_GI_40=0;
+ u16 mcs_rate=0;
-+ u32 ht_ielen = 0;
++ u32 ht_ielen = 0;
+#endif
+
+#ifdef CONFIG_MP_INCLUDED
+ if (adapter->registrypriv.mp_mode == 1)
-+ {
++ {
+ if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE)
+ return 0;
+ }
+#endif
+
-+ if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE)
++ if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE)
+ && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE))
+ return 0;
+
@@ -16486,13 +16474,13 @@ index 000000000000..564ff6eaebec
+ if(p && ht_ielen>0)
+ {
+ pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
-+
++
+ _rtw_memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2);
+
+ //bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1:0;
+ //cur_bwmod is updated by beacon, pmlmeinfo is updated by association response
+ bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0])) ? 1:0;
-+
++
+ //short_GI = (pht_capie->cap_info&(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) ? 1:0;
+ short_GI_20 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_20) ? 1:0;
+ short_GI_40 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_40) ? 1:0;
@@ -16500,13 +16488,13 @@ index 000000000000..564ff6eaebec
+ rtw_hal_get_hwreg(adapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
+ max_rate = rtw_mcs_rate(
+ rf_type,
-+ bw_40MHz & (pregistrypriv->cbw40_enable),
++ bw_40MHz & (pregistrypriv->cbw40_enable),
+ short_GI_20,
+ short_GI_40,
+ pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate
+ );
+ }
-+ }
++ }
+ else
+#endif //CONFIG_80211N_HT
+ {
@@ -16517,7 +16505,7 @@ index 000000000000..564ff6eaebec
+ max_rate = rate;
+ i++;
+ }
-+
++
+ max_rate = max_rate*10/2;
+ }
+
@@ -16525,27 +16513,27 @@ index 000000000000..564ff6eaebec
+}
+
+/*
-+* rtw_set_scan_mode -
++* rtw_set_scan_mode -
+* @adapter: pointer to _adapter structure
-+* @scan_mode:
-+*
++* @scan_mode:
++*
+* Return _SUCCESS or _FAIL
+*/
+int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode)
+{
+ if(scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
+ return _FAIL;
-+
++
+ adapter->mlmepriv.scan_mode = scan_mode;
+
+ return _SUCCESS;
+}
+
+/*
-+* rtw_set_channel_plan -
++* rtw_set_channel_plan -
+* @adapter: pointer to _adapter structure
-+* @channel_plan:
-+*
++* @channel_plan:
++*
+* Return _SUCCESS or _FAIL
+*/
+int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan)
@@ -16558,10 +16546,10 @@ index 000000000000..564ff6eaebec
+}
+
+/*
-+* rtw_set_country -
++* rtw_set_country -
+* @adapter: pointer to _adapter structure
+* @country_code: string of country code
-+*
++*
+* Return _SUCCESS or _FAIL
+*/
+int rtw_set_country(_adapter *adapter, const char *country_code)
@@ -16582,15 +16570,15 @@ index 000000000000..564ff6eaebec
+ channel_plan = RT_CHANNEL_DOMAIN_CHINA;
+ else
+ DBG_871X("%s unknown country_code:%s\n", __FUNCTION__, country_code);
-+
++
+ return rtw_set_channel_plan(adapter, channel_plan);
+}
+
+/*
-+* rtw_set_band -
++* rtw_set_band -
+* @adapter: pointer to _adapter structure
+* @band: band to set
-+*
++*
+* Return _SUCCESS or _FAIL
+*/
+int rtw_set_band(_adapter *adapter, enum _BAND band)
@@ -16604,17 +16592,16 @@ index 000000000000..564ff6eaebec
+ DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" band:%d fail\n", FUNC_ADPT_ARG(adapter), band);
+ return _FAIL;
+}
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c
new file mode 100755
-index 000000000000..872cc4234fc4
+index 000000000000..20632d66bb4c
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c
-@@ -0,0 +1,263 @@
+@@ -0,0 +1,262 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -16647,7 +16634,7 @@ index 000000000000..872cc4234fc4
+ DBG_871X("%s rtw_alloc_xmitframe return null\n", __FUNCTION__);
+ goto exit;
+ }
-+
++
+ if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL)
+ {
+ DBG_871X("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__);
@@ -16655,7 +16642,7 @@ index 000000000000..872cc4234fc4
+ xmit_frame=NULL;
+ goto exit;
+ }
-+
++
+ xmit_frame->frame_tag = MGNT_FRAMETAG;
+ xmit_frame->pxmitbuf = xmitbuf;
+ xmit_frame->buf_addr = xmitbuf->pbuf;
@@ -16711,14 +16698,14 @@ index 000000000000..872cc4234fc4
+ pattrib->last_txcmdsz += cmd_len;
+
+ //DBG_871X("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen);
-+
++
+ return _SUCCESS;
+}
+
+int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary)
+{
+ IOL_CMD cmd = {0x0, IOL_CMD_LLT, 0x0, 0x0};
-+
++
+ RTW_PUT_BE32((u8*)&cmd.value, (u32)page_boundary);
+
+ return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
@@ -16727,7 +16714,7 @@ index 000000000000..872cc4234fc4
+int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value)
+{
+ IOL_CMD cmd = {0x0, IOL_CMD_WB_REG, 0x0, 0x0};
-+
++
+ RTW_PUT_BE16((u8*)&cmd.address, (u16)addr);
+ RTW_PUT_BE32((u8*)&cmd.value, (u32)value);
+
@@ -16737,7 +16724,7 @@ index 000000000000..872cc4234fc4
+int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value)
+{
+ IOL_CMD cmd = {0x0, IOL_CMD_WW_REG, 0x0, 0x0};
-+
++
+ RTW_PUT_BE16((u8*)&cmd.address, (u16)addr);
+ RTW_PUT_BE32((u8*)&cmd.value, (u32)value);
+
@@ -16748,7 +16735,7 @@ index 000000000000..872cc4234fc4
+{
+ IOL_CMD cmd = {0x0, IOL_CMD_WD_REG, 0x0, 0x0};
+ u8* pos = (u8 *)&cmd;
-+
++
+ RTW_PUT_BE16((u8*)&cmd.address, (u16)addr);
+ RTW_PUT_BE32((u8*)&cmd.value, (u32)value);
+
@@ -16784,7 +16771,7 @@ index 000000000000..872cc4234fc4
+int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
+{
+ IOL_CMD cmd = {0x0, IOL_CMD_DELAY_US, 0x0, 0x0};
-+
++
+ RTW_PUT_BE32((u8*)&cmd.value, (u32)us);
+
+ //DBG_871X("%s %u\n", __FUNCTION__, us);
@@ -16795,7 +16782,7 @@ index 000000000000..872cc4234fc4
+int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
+{
+ IOL_CMD cmd = {0x0, IOL_CMD_DELAY_MS, 0x0, 0x0};
-+
++
+ RTW_PUT_BE32((u8*)&cmd.value, (u32)ms);
+
+ //DBG_871X("%s %u\n", __FUNCTION__, ms);
@@ -16831,7 +16818,7 @@ index 000000000000..872cc4234fc4
+ pattrib->last_txcmdsz += 8;
+
+ //DBG_871X("%s ori:%u + 8 = %u\n", __FUNCTION__ , ori_len, buf_offset+pattrib->pktlen);
-+
++
+ return _SUCCESS;
+}
+
@@ -16873,17 +16860,16 @@ index 000000000000..872cc4234fc4
+}
+
+#endif //CONFIG_IOL
-+
diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c
new file mode 100755
-index 000000000000..00edd9cc6955
+index 000000000000..2dc13a43c118
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c
-@@ -0,0 +1,3967 @@
+@@ -0,0 +1,3966 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
@@ -16945,26 +16931,26 @@ index 000000000000..00edd9cc6955
+ pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown;
+ pmlmepriv->scan_mode=SCAN_ACTIVE;// 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff)
+
-+ _rtw_spinlock_init(&(pmlmepriv->lock));
++ _rtw_spinlock_init(&(pmlmepriv->lock));
+ _rtw_init_queue(&(pmlmepriv->free_bss_pool));
+ _rtw_init_queue(&(pmlmepriv->scanned_queue));
+
+ set_scanned_network_val(pmlmepriv, 0);
-+
++
+ _rtw_memset(&pmlmepriv->assoc_ssid,0,sizeof(NDIS_802_11_SSID));
+
+ pbuf = rtw_zvmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)));
-+
++
+ if (pbuf == NULL){
+ res=_FAIL;
+ goto exit;
+ }
+ pmlmepriv->free_bss_buf = pbuf;
-+
++
+ pnetwork = (struct wlan_network *)pbuf;
-+
++
+ for(i = 0; i < MAX_BSS_CNT; i++)
-+ {
++ {
+ _rtw_init_listhead(&(pnetwork->list));
+
+ rtw_list_insert_tail(&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue));
@@ -16983,7 +16969,7 @@ index 000000000000..00edd9cc6955
+_func_exit_;
+
+ return res;
-+}
++}
+
+void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv);
+void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv)
@@ -16996,11 +16982,11 @@ index 000000000000..00edd9cc6955
+static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen)
+{
+ if(*ppie)
-+ {
++ {
+ rtw_mfree(*ppie, *plen);
+ *plen = 0;
+ *ppie=NULL;
-+ }
++ }
+}
+
+void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
@@ -17012,7 +16998,7 @@ index 000000000000..00edd9cc6955
+ rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_req_ie, &pmlmepriv->wps_probe_req_ie_len);
+ rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_resp_ie, &pmlmepriv->wps_probe_resp_ie_len);
+ rtw_free_mlme_ie_data(&pmlmepriv->wps_assoc_resp_ie, &pmlmepriv->wps_assoc_resp_ie_len);
-+
++
+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie, &pmlmepriv->p2p_beacon_ie_len);
+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie, &pmlmepriv->p2p_probe_req_ie_len);
+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie, &pmlmepriv->p2p_probe_resp_ie_len);
@@ -17020,7 +17006,7 @@ index 000000000000..00edd9cc6955
+ rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc_req_ie_len);
+#endif
+
-+#if defined(CONFIG_WFD) && defined(CONFIG_IOCTL_CFG80211)
++#if defined(CONFIG_WFD) && defined(CONFIG_IOCTL_CFG80211)
+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_beacon_ie, &pmlmepriv->wfd_beacon_ie_len);
+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_probe_req_ie, &pmlmepriv->wfd_probe_req_ie_len);
+ rtw_free_mlme_ie_data(&pmlmepriv->wfd_probe_resp_ie, &pmlmepriv->wfd_probe_resp_ie_len);
@@ -17043,27 +17029,27 @@ index 000000000000..00edd9cc6955
+ rtw_vmfree(pmlmepriv->free_bss_buf, MAX_BSS_CNT * sizeof(struct wlan_network));
+ }
+ }
-+_func_exit_;
++_func_exit_;
+}
+
+sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
+{
+ _irqL irqL;
+
-+_func_enter_;
++_func_enter_;
+
+ if (pnetwork == NULL)
+ goto exit;
-+
++
+ _enter_critical_bh(&queue->lock, &irqL);
+
+ rtw_list_insert_tail(&pnetwork->list, &queue->queue);
+
+ _exit_critical_bh(&queue->lock, &irqL);
+
-+exit:
++exit:
+
-+_func_exit_;
++_func_exit_;
+
+ return _SUCCESS;
+}
@@ -17074,24 +17060,24 @@ index 000000000000..00edd9cc6955
+
+ struct wlan_network *pnetwork;
+
-+_func_enter_;
++_func_enter_;
+
+ _enter_critical_bh(&queue->lock, &irqL);
+
+ if (_rtw_queue_empty(queue) == _TRUE)
+
+ pnetwork = NULL;
-+
++
+ else
+ {
+ pnetwork = LIST_CONTAINOR(get_next(&queue->queue), struct wlan_network, list);
-+
++
+ rtw_list_delete(&(pnetwork->list));
+ }
-+
++
+ _exit_critical_bh(&queue->lock, &irqL);
+
-+_func_exit_;
++_func_exit_;
+
+ return pnetwork;
+}
@@ -17099,49 +17085,49 @@ index 000000000000..00edd9cc6955
+struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )//(_queue *free_queue)
+{
+ _irqL irqL;
-+ struct wlan_network *pnetwork;
++ struct wlan_network *pnetwork;
+ _queue *free_queue = &pmlmepriv->free_bss_pool;
+ _list* plist = NULL;
-+
-+_func_enter_;
++
++_func_enter_;
+
+ _enter_critical_bh(&free_queue->lock, &irqL);
-+
++
+ if (_rtw_queue_empty(free_queue) == _TRUE) {
+ pnetwork=NULL;
+ goto exit;
+ }
+ plist = get_next(&(free_queue->queue));
-+
++
+ pnetwork = LIST_CONTAINOR(plist , struct wlan_network, list);
-+
++
+ rtw_list_delete(&pnetwork->list);
-+
++
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr=%p\n", plist));
+ pnetwork->network_type = 0;
+ pnetwork->fixed = _FALSE;
+ pnetwork->last_scanned = rtw_get_current_time();
-+ pnetwork->aid=0;
++ pnetwork->aid=0;
+ pnetwork->join_res=0;
+
+ pmlmepriv->num_of_scanned ++;
-+
++
+exit:
+ _exit_critical_bh(&free_queue->lock, &irqL);
+
-+_func_exit_;
++_func_exit_;
+
-+ return pnetwork;
++ return pnetwork;
+}
+
+void _rtw_free_network(struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwork, u8 isfreeall)
+{
+ u32 curr_time, delta_time;
+ u32 lifetime = SCANQUEUE_LIFETIME;
-+ _irqL irqL;
++ _irqL irqL;
+ _queue *free_queue = &(pmlmepriv->free_bss_pool);
-+
-+_func_enter_;
++
++_func_enter_;
+
+ if (pnetwork == NULL)
+ goto exit;
@@ -17149,9 +17135,9 @@ index 000000000000..00edd9cc6955
+ if (pnetwork->fixed == _TRUE)
+ goto exit;
+
-+ curr_time = rtw_get_current_time();
++ curr_time = rtw_get_current_time();
+
-+ if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) ||
++ if ( (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==_TRUE ) ||
+ (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==_TRUE ) )
+ lifetime = 1;
+
@@ -17170,10 +17156,10 @@ index 000000000000..00edd9cc6955
+
+#ifdef PLATFORM_LINUX
+
-+ delta_time = (curr_time -pnetwork->last_scanned)/HZ;
++ delta_time = (curr_time -pnetwork->last_scanned)/HZ;
+
+ if(delta_time < lifetime)// unit:sec
-+ {
++ {
+ goto exit;
+ }
+
@@ -17181,10 +17167,10 @@ index 000000000000..00edd9cc6955
+
+#ifdef PLATFORM_FREEBSD
+ //i think needs to check again
-+ delta_time = (curr_time -pnetwork->last_scanned)/hz;
++ delta_time = (curr_time -pnetwork->last_scanned)/hz;
+
+ if(delta_time < lifetime)// unit:sec
-+ {
++ {
+ goto exit;
+ }
+
@@ -17192,21 +17178,21 @@ index 000000000000..00edd9cc6955
+ }
+
+ _enter_critical_bh(&free_queue->lock, &irqL);
-+
++
+ rtw_list_delete(&(pnetwork->list));
+
+ rtw_list_insert_tail(&(pnetwork->list),&(free_queue->queue));
-+
++
+ pmlmepriv->num_of_scanned --;
-+
++
+
+ //DBG_871X("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid);
-+
++
+ _exit_critical_bh(&free_queue->lock, &irqL);
-+
-+exit:
-+
-+_func_exit_;
++
++exit:
++
++_func_exit_;
+
+}
+
@@ -17215,7 +17201,7 @@ index 000000000000..00edd9cc6955
+
+ _queue *free_queue = &(pmlmepriv->free_bss_pool);
+
-+_func_enter_;
++_func_enter_;
+
+ if (pnetwork == NULL)
+ goto exit;
@@ -17224,18 +17210,18 @@ index 000000000000..00edd9cc6955
+ goto exit;
+
+ //_enter_critical(&free_queue->lock, &irqL);
-+
++
+ rtw_list_delete(&(pnetwork->list));
+
+ rtw_list_insert_tail(&(pnetwork->list), get_list_head(free_queue));
-+
++
+ pmlmepriv->num_of_scanned --;
-+
++
+ //_exit_critical(&free_queue->lock, &irqL);