Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Mon, 6 Feb 2012 19:26:39 +0000 (14:26 -0500)]
Conflicts:
drivers/net/wireless/rtlwifi/rtl8192se/sw.c

15 files changed:
1  2 
MAINTAINERS
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
net/mac80211/ibss.c
net/mac80211/iface.c
net/mac80211/mesh_hwmp.c
net/mac80211/mesh_plink.c
net/mac80211/mlme.c
net/mac80211/rx.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -186,9 -226,14 +226,11 @@@ static int rtl92s_init_sw_vars(struct i
  
        /* for firmware buf */
        rtlpriv->rtlhal.pfirmware = vzalloc(sizeof(struct rt_firmware));
 -      if (!rtlpriv->rtlhal.pfirmware) {
 -              RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 -                       "Can't alloc buffer for fw\n");
 +      if (!rtlpriv->rtlhal.pfirmware)
                return 1;
 -      }
  
+       rtlpriv->max_fw_size = sizeof(struct rt_firmware);
        pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
                "Loading firmware %s\n", rtlpriv->cfg->fw_name);
        /* request fw */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge