Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorFelipe Balbi <balbi@ti.com>
Mon, 4 Mar 2013 09:22:22 +0000 (11:22 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 4 Mar 2013 09:22:22 +0000 (11:22 +0200)
* 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx: (483 commits)
  wlcore: fix wrong remote rates when starting STA role
  wl18xx: add new phy configuration parameters for telec support
  wlcore: don't hide real error code when booting fails
  wlcore: move wl12xx_platform_data up and make it truly optional
  wlcore: use PLATFORM_DEVID_AUTO for plat dev creation to avoid conflicts
  wlcore: use wl12xx_platform_data pointer from wlcore_pdev_data
  wlcore: remove if_ops from platform_data
  wlcore: remove unused set_power method
  wlcore: use single-role version when verifying the PLT firmware
  rtlwifi: rtl8723ae: Fix W=1 compile warnings
  rtlwifi: rtl8192de: Fix W=1 build warnings
  rtlwifi: rtl8192cu: Fix W=1 build warning
  rtlwifi: rtl8192c: Fix W=1 warning
  rtlwifi: Fix warnings in usb.c
  rtlwifi: Fix many compile warnings when using W=1
  wireless: rt2x00: rt2800pci add id
  bcma: cc: fix (and rename) define of NAND flash type
  ath9k: Remove unused variables in ath_mci_cleanup
  ath9k: Fix sparse __CHECK_ENDIAN__ for spectral code
  ath9k: Only remove spectral scan relay file when it was created
  ...

Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c

20 files changed:
1  2 
arch/arm/mach-omap2/board-omap3evm.c
drivers/bcma/bcma_private.h
drivers/bcma/driver_chipcommon_nflash.c
drivers/bcma/driver_gpio.c
drivers/bcma/driver_pci_host.c
drivers/bcma/main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rtlwifi/usb.c
drivers/nfc/pn544/i2c.c
drivers/ssb/driver_gpio.c
drivers/ssb/main.c
drivers/ssb/ssb_private.h
include/linux/bcma/bcma_driver_pci.h
net/mac80211/cfg.c
net/mac80211/mlme.c
net/wireless/core.c
net/wireless/reg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 279796419ea0ca036800483aad59321e881efbe5,7b0550d35a91e25d009d310f3cadf01e35f1df70..492722c0e25c9300b394d33665ffd2099b2b12a4
@@@ -1215,7 -1210,15 +1207,8 @@@ int iwlagn_rx_reply_tx(struct iwl_priv 
                        freed++;
                }
  
-               WARN_ON(!is_agg && freed != 1);
 -              if (tid != IWL_TID_NON_QOS) {
 -                      priv->tid_data[sta_id][tid].next_reclaimed =
 -                              next_reclaimed;
 -                      IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
 -                                         next_reclaimed);
 -              }
 -
+               if (!is_agg && freed != 1)
+                       IWL_ERR(priv, "Q: %d, freed %d\n", txq_id, freed);
  
                /*
                 * An offchannel frame can be send only on the AUX queue, where
Simple merge
Simple merge
index 2a9c8d93d2e8a302e8db87b91160e7fdd301a77d,7f96ca2c46bd13cfa1d8dafedb27abd9828b5740..8cf64c19f0229c97952ecd9f9fb689b29c6c3240
@@@ -469,32 -461,10 +461,10 @@@ static struct i2c_driver pn544_hci_i2c_
                  },
        .probe = pn544_hci_i2c_probe,
        .id_table = pn544_hci_i2c_id_table,
 -      .remove = __devexit_p(pn544_hci_i2c_remove),
 +      .remove = pn544_hci_i2c_remove,
  };
  
- static int __init pn544_hci_i2c_init(void)
- {
-       int r;
-       pr_debug(DRIVER_DESC ": %s\n", __func__);
-       r = i2c_add_driver(&pn544_hci_i2c_driver);
-       if (r) {
-               pr_err(PN544_HCI_I2C_DRIVER_NAME
-                      ": driver registration failed\n");
-               return r;
-       }
-       return 0;
- }
- static void __exit pn544_hci_i2c_exit(void)
- {
-       i2c_del_driver(&pn544_hci_i2c_driver);
- }
- module_init(pn544_hci_i2c_init);
- module_exit(pn544_hci_i2c_exit);
+ module_i2c_driver(pn544_hci_i2c_driver);
  
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION(DRIVER_DESC);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 82c4fc7c994cbe3a0dc89b4a6708f873fcc783d9,6ea626b30a2ac4dbad10901a3b2c370eb002f103..de02d633c212eb6ea516a7d87e05978a2a1b3ba9
@@@ -2365,17 -2249,32 +2249,25 @@@ int set_regdom(const struct ieee80211_r
        return r;
  }
  
 -#ifdef CONFIG_HOTPLUG
  int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
  {
-       if (last_request && !last_request->processed) {
-               if (add_uevent_var(env, "COUNTRY=%c%c",
-                                  last_request->alpha2[0],
-                                  last_request->alpha2[1]))
-                       return -ENOMEM;
+       struct regulatory_request *lr;
+       u8 alpha2[2];
+       bool add = false;
+       rcu_read_lock();
+       lr = get_last_request();
+       if (lr && !lr->processed) {
+               memcpy(alpha2, lr->alpha2, 2);
+               add = true;
        }
+       rcu_read_unlock();
  
+       if (add)
+               return add_uevent_var(env, "COUNTRY=%c%c",
+                                     alpha2[0], alpha2[1]);
        return 0;
  }
 -#else
 -int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 -{
 -      return -ENODEV;
 -}
 -#endif /* CONFIG_HOTPLUG */
  
  void wiphy_regulatory_register(struct wiphy *wiphy)
  {