Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ipw2x00/ipw2200.c

diff --cc Documentation/feature-removal-schedule.txt
index 842aa9de84a603298f74f9f4b8c036e0104001cf,cd89d1e5a6a80b613f88de89aa16ae2035d77e4b..f45638962858191209b4662693124789a2613de1
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -548,19 -564,12 +548,28 @@@ Who:    Rafael J. Wysocki <rjw@sisk.pl
  
  ----------------------------
  
 +What:         PCI DMA unmap state API
 +When: August 2012
 +Why:  PCI DMA unmap state API (include/linux/pci-dma.h) was replaced
 +      with DMA unmap state API (DMA unmap state API can be used for
 +      any bus).
 +Who:  FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 +
 +----------------------------
 +
 +What:         DMA_xxBIT_MASK macros
 +When: Jun 2011
 +Why:  DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
 +Who:  FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 +
 +----------------------------
 +
+ What: iwlwifi disable_hw_scan module parameters
+ When: 2.6.40
+ Why:  Hareware scan is the prefer method for iwlwifi devices for
+       scanning operation. Remove software scan support for all the
+       iwlwifi devices.
+ 
+ Who:  Wey-Yi Guy <wey-yi.w.guy@intel.com>
+ 
+ ----------------------------

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/b43/phy_n.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
index 0f2508384c751c35422e598f1c561e1db2372d43,d04d760827779c5bf0289e75985e66f4913bee47..8d6ed5f6f46f4a423e31943dc70b70fd3727569f
--- 1/drivers/net/wireless/ipw2x00/ipw2200.c
--- 2/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@@ -11467,9 -11467,13 +11467,13 @@@ static int ipw_net_init(struct net_devi
  
                bg_band->band = IEEE80211_BAND_2GHZ;
                bg_band->n_channels = geo->bg_channels;
 -              bg_band->channels =
 -                      kzalloc(geo->bg_channels *
 -                              sizeof(struct ieee80211_channel), GFP_KERNEL);
 +              bg_band->channels = kcalloc(geo->bg_channels,
 +                                          sizeof(struct ieee80211_channel),
 +                                          GFP_KERNEL);
+               if (!bg_band->channels) {
+                       rc = -ENOMEM;
+                       goto out;
+               }
                /* translate geo->bg to bg_band.channels */
                for (i = 0; i < geo->bg_channels; i++) {
                        bg_band->channels[i].band = IEEE80211_BAND_2GHZ;
@@@ -11502,9 -11506,13 +11506,13 @@@
  
                a_band->band = IEEE80211_BAND_5GHZ;
                a_band->n_channels = geo->a_channels;
 -              a_band->channels =
 -                      kzalloc(geo->a_channels *
 -                              sizeof(struct ieee80211_channel), GFP_KERNEL);
 +              a_band->channels = kcalloc(geo->a_channels,
 +                                         sizeof(struct ieee80211_channel),
 +                                         GFP_KERNEL);
+               if (!a_band->channels) {
+                       rc = -ENOMEM;
+                       goto out;
+               }
                /* translate geo->bg to a_band.channels */
                for (i = 0; i < geo->a_channels; i++) {
                        a_band->channels[i].band = IEEE80211_BAND_2GHZ;

diff --cc drivers/net/wireless/libertas/cfg.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt61pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt73usb.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_scan.c
index e4950c8e396e38a57c553c81875ab51b2aa04d43,5c76b79a96bf0e27f3e478d746f62f1b9edcb2eb..909bb47995b6907ee8afad05c3acf37500043d4a
--- 1/drivers/net/wireless/wl12xx/wl1271_scan.c
--- 2/drivers/net/wireless/wl12xx/wl1271_scan.c
+++ b/drivers/net/wireless/wl12xx/wl1271_scan.c
@@@ -246,9 -292,14 +292,14 @@@ int wl1271_scan(struct wl1271 *wl, cons
  
        wl->scan.req = req;
  
 -      wl->scan.scanned_ch = kzalloc(req->n_channels *
 +      wl->scan.scanned_ch = kcalloc(req->n_channels,
                                      sizeof(*wl->scan.scanned_ch),
                                      GFP_KERNEL);
+       /* we assume failure so that timeout scenarios are handled correctly */
+       wl->scan.failed = true;
+       ieee80211_queue_delayed_work(wl->hw, &wl->scan_complete_work,
+                                    msecs_to_jiffies(WL1271_SCAN_TIMEOUT));
+ 
        wl1271_scan_stm(wl);
  
        return 0;

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/wireless/core.h
Simple merge