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

diff --combined drivers/net/wireless/b43/main.c
index 8c24cd72aaca711ae9852fcdd0b0e0c2bb44b325,1e95c4f5256bd72930a2facdc6ea2481cfaa1ce3..6c7db9a1a466e06abe2b4abcdff186ea69161685
--- 1/drivers/net/wireless/b43/main.c
--- 2/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -2171,7 -2171,7 +2171,7 @@@ static int b43_write_initvals(struct b4
                                goto err_format;
                        array_size -= sizeof(iv->data.d32);
  
 -                      value = be32_to_cpu(get_unaligned(&iv->data.d32));
 +                      value = get_unaligned_be32(&iv->data.d32);
                        b43_write32(dev, offset, value);
  
                        iv = (const struct b43_iv *)((const uint8_t *)iv +
@@@ -2808,10 -2808,10 +2808,10 @@@ static int b43_rng_read(struct hwrng *r
        return (sizeof(u16));
  }
  
 -static void b43_rng_exit(struct b43_wl *wl, bool suspended)
 +static void b43_rng_exit(struct b43_wl *wl)
  {
        if (wl->rng_initialized)
 -              __hwrng_unregister(&wl->rng, suspended);
 +              hwrng_unregister(&wl->rng);
  }
  
  static int b43_rng_init(struct b43_wl *wl)
@@@ -3832,7 -3832,7 +3832,7 @@@ static void b43_wireless_core_exit(stru
  
        if (!dev->suspend_in_progress) {
                b43_leds_exit(dev);
 -              b43_rng_exit(dev->wl, false);
 +              b43_rng_exit(dev->wl);
        }
        b43_dma_free(dev);
        b43_pio_free(dev);
@@@ -4326,6 -4326,14 +4326,14 @@@ static int b43_wireless_core_attach(str
                err = -EOPNOTSUPP;
                goto err_powerdown;
        }
+       if (1 /* disable A-PHY */) {
+               /* FIXME: For now we disable the A-PHY on multi-PHY devices. */
+               if (dev->phy.type != B43_PHYTYPE_N) {
+                       have_2ghz_phy = 1;
+                       have_5ghz_phy = 0;
+               }
+       }
+ 
        dev->phy.gmode = have_2ghz_phy;
        tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;
        b43_wireless_core_reset(dev, tmp);
@@@ -4613,7 -4621,7 +4621,7 @@@ static int b43_resume(struct ssb_devic
                err = b43_wireless_core_start(wldev);
                if (err) {
                        b43_leds_exit(wldev);
 -                      b43_rng_exit(wldev->wl, true);
 +                      b43_rng_exit(wldev->wl);
                        b43_wireless_core_exit(wldev);
                        b43err(wl, "Resume failed at core start\n");
                        goto out;

diff --combined drivers/net/wireless/libertas/scan.c
index 1a409fcc80d3fdb30f65a703a2938bcba58af8d2,7234669d05c003819458274ec2d48a9ed235820a..d448c9702a0f93528d66f7d5f2ee116a452a1604
--- 1/drivers/net/wireless/libertas/scan.c
--- 2/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@@ -298,7 -298,8 +298,8 @@@ static int lbs_do_scan(struct lbs_priva
        uint8_t *tlv;   /* pointer into our current, growing TLV storage area */
  
        lbs_deb_enter_args(LBS_DEB_SCAN, "bsstype %d, chanlist[].chan %d, chan_count %d",
-                          bsstype, chan_list[0].channumber, chan_count);
+               bsstype, chan_list ? chan_list[0].channumber : -1,
+               chan_count);
  
        /* create the fixed part for scan command */
        scan_cmd = kzalloc(MAX_SCAN_CFG_ALLOC, GFP_KERNEL);
@@@ -522,7 -523,7 +523,7 @@@ static int lbs_process_bss(struct bss_d
  
        if (*bytesleft >= sizeof(beaconsize)) {
                /* Extract & convert beacon size from the command buffer */
 -              beaconsize = le16_to_cpu(get_unaligned((__le16 *)*pbeaconinfo));
 +              beaconsize = get_unaligned_le16(*pbeaconinfo);
                *bytesleft -= sizeof(beaconsize);
                *pbeaconinfo += sizeof(beaconsize);
        }

diff --combined net/mac80211/mesh.h
index 9ee3affab346a548bc4f046afac9c7fc07134b11,9f8cb76904986e4c0352e6e3025ac0f95fed581c..2e161f6d8288255d47609fb83febf9bc2faae5ba
--- 1/net/mac80211/mesh.h
--- 2/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@@ -13,7 -13,6 +13,7 @@@
  
  #include <linux/types.h>
  #include <linux/jhash.h>
 +#include <asm/unaligned.h>
  #include "ieee80211_i.h"
  
  
@@@ -140,7 -139,7 +140,7 @@@ struct rmc_entry 
  
  struct mesh_rmc {
        struct rmc_entry bucket[RMC_BUCKETS];
-       u8 idx_mask;
+       u32 idx_mask;
  };