1. 27 9月, 2014 1 次提交
    • L
      rtlwifi: rtl8821ae: Move driver from staging to regular tree · 21e4b072
      Larry Finger 提交于
      This driver was entered into staging a few cycles ago because there was
      not time to integrate the Realtek version into the support routines in
      the kernel. Now that there is an effort to converg the code base from Linux
      and the Realtek repo, it is time to move this driver. In addition, all the
      updates included in the 06/28/2014 version of the Realtek drivers are
      included here.
      
      With this change, it will be necessary to delete the staging driver. That
      will be handled in a separate patch. As it impacts the staging tree, such a
      patch is sent to a different destination.
      Signed-off-by: NLarry Finger <Larry.Finger@lwfinger.net>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      21e4b072
  2. 24 1月, 2014 1 次提交
    • G
      Staging: rtl8812ae: Add Realtek 8821 PCI WIFI driver · 3c05bedb
      Greg Kroah-Hartman 提交于
      This comes directly from the Realtek tarball, filename:
      	wifi_driver_8821ae_0018.1129.2013.tar.gz
      
      I mushed the three modules (btcoexist, rtlwifi and rtl8821ae) together
      into one, in order to make it all build as one stand-alone module.
      After the btcoexist driver gets merged upstream, I'll pull it out of
      here, and will continue to work on removing this version of rtlwifi in
      order to use the in-kernel one.
      
      Cc: Larry Finger <Larry.Finger@lwfinger.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      3c05bedb