1. 13 Jan, 2014 5 commits
    • Luis R. Rodriguez's avatar
      cfg80211: make regulatory_hint() remove REGULATORY_CUSTOM_REG · 4f7b9140
      Luis R. Rodriguez authored
      The REGULATORY_CUSTOM_REG can be used during early init with
      the goal of overriding the wiphy's default regulatory settings
      in case the alpha2 of the device is not known. In the case that
      the alpha2 becomes known lets avoid having drivers having to
      clear the REGULATORY_CUSTOM_REG flag by doing it for them
      when regulatory_hint() is used.
      
      Cc: Sujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      4f7b9140
    • Luis R. Rodriguez's avatar
      ath: fix warning on usage of REGULATORY_CUSTOM_REG · 8fc68580
      Luis R. Rodriguez authored
      ath wants to first apply the custom regd and only later
      will it revert to not using it if an alpha2 regulatory
      domain is found. Since the wireless core now enforces
      usage of the REGULATORY_CUSTOM_REG strictly when
      wiphy_apply_custom_regulatory() is used this makes
      ath adhere to the expected behaviour but also updates
      the wiphy after its done with the custom usage.
      
      This fixes this warning:
      
      [    5.488733] ath: phy0: ASPM enabled: 0x43
      [    5.488735] ath: EEPROM regdomain: 0x0
      [    5.488736] ath: EEPROM indicates default country code should be used
      [    5.488736] ath: doing EEPROM country->regdmn map search
      [    5.488737] ath: country maps to regdmn code: 0x3a
      [    5.488737] ath: Country alpha2 being used: US
      [    5.488738] ath: Regpair used: 0x3a
      [    5.488738] ------------[ cut here ]------------
      [    5.488745] WARNING: CPU: 0 PID: 161 at
      	/home/sujith/dev/wireless-testing/net/wireless/reg.c:1361
      	wiphy_apply_custom_regulatory+0x17a/0x1b0 [cfg80211]()
      [    5.488746] wiphy should have REGULATORY_CUSTOM_REG
      
      The wireless core can *later* lift this flag for us for when
      using the regulatory_hint() to make this fix more generic.
      Reported-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
      Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      8fc68580
    • John W. Linville's avatar
    • John W. Linville's avatar
    • John W. Linville's avatar
      Merge tag 'nfc-next-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · ec665fac
      John W. Linville authored
      Samuel Ortiz <sameo@linux.intel.com> says:
      
      "This is the first NFC pull request for 3.14
      
      It includes:
      
      * A new NFC driver for Marvell's 8897, and a few NCI fixes and
        improvements needed to support this chipset.
      
      * An LLCP fix for how we were setting the default MIU on a p2p link. If
        there is no explicit MIU extension announced at connection time, we
        must use the default one and not the one announced at LLCP link
        establishement time.
      
      * A pn544 EEPROM config update. Some of the currently EEPROM configured
        values are overwriting the firmware ones while other should not be set
        by the driver itself.
      
      * Some NFC digital stack fixes and improvements. Asynchronous functions
        are better documented, RF technologies and CRC functions are set upon
        PSL_REQ reception, and a few minor bugs are fixed.
      
      * Minor and miscelaneous pn533, mei_phy and port100 fixes."
      Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      ec665fac
  2. 10 Jan, 2014 26 commits
  3. 09 Jan, 2014 9 commits