Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 5 May 2010 20:14:16 +0000 (16:14 -0400)]
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c

59 files changed:
1  2 
MAINTAINERS
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/debugfs.c
drivers/net/wireless/iwmc3200wifi/sdio.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/if_usb.c
drivers/net/wireless/libertas_tf/main.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/orinoco/fw.c
drivers/net/wireless/orinoco/hw.c
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/wext.c
drivers/net/wireless/p54/main.c
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/rtl818x/rtl8180_dev.c
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/net/wireless/wl12xx/wl1251_main.c
drivers/net/wireless/wl12xx/wl1251_rx.c
drivers/net/wireless/wl12xx/wl1271_acx.c
drivers/net/wireless/wl12xx/wl1271_boot.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/ssb/main.c
drivers/ssb/pci.c
drivers/ssb/sprom.c
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/driver-ops.h
net/mac80211/ibss.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/scan.c
net/mac80211/work.c
net/wireless/core.c
net/wireless/nl80211.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -7,8 -7,8 +7,10 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +#include <linux/slab.h>
 +
  #include "libertas_tf.h"
  
  static const struct channel_range channel_ranges[] = {
  #include <linux/moduleparam.h>
  #include <linux/firmware.h>
  #include <linux/netdevice.h>
 +#include <linux/slab.h>
  #include <linux/usb.h>
  
- #define DRV_NAME "lbtf_usb"
- #include "libertas_tf.h"
- #include "if_usb.h"
+ #define INSANEDEBUG   0
+ #define lbtf_deb_usb2(...) do { if (INSANEDEBUG) lbtf_deb_usbd(__VA_ARGS__); } while (0)
  
  #define MESSAGE_HEADER_LEN    4
  
@@@ -7,10 -7,10 +7,12 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +#include <linux/slab.h>
 +
+ #include <linux/etherdevice.h>
  #include "libertas_tf.h"
- #include "linux/etherdevice.h"
  
  #define DRIVER_RELEASE_VERSION "004.p0"
  /* thinfirm version: 5.132.X.pX */
Simple merge
Simple merge
Simple merge
@@@ -1086,13 -1087,13 +1087,13 @@@ int __orinoco_hw_set_multicast_list(str
                struct hermes_multicast mclist;
                int i = 0;
  
 -              netdev_for_each_mc_addr(p, dev) {
 +              netdev_for_each_mc_addr(ha, dev) {
                        if (i == mc_count)
                                break;
 -                      memcpy(mclist.addr[i++], p->dmi_addr, ETH_ALEN);
 +                      memcpy(mclist.addr[i++], ha->addr, ETH_ALEN);
                }
  
-               err = hermes_write_ltv(hw, USER_BAP,
+               err = hw->ops->write_ltv(hw, USER_BAP,
                                   HERMES_RID_CNFGROUPADDRESSES,
                                   HERMES_BYTES_TO_RECLEN(mc_count * ETH_ALEN),
                                   &mclist);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge