From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 5 May 2010 20:14:16 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=83163244f845c296a118ce85c653872dbff6abfe;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/libertas_tf/cmd.c
	drivers/net/wireless/libertas_tf/main.c
---

83163244f845c296a118ce85c653872dbff6abfe
diff --cc drivers/net/wireless/libertas_tf/cmd.c
index b620daf59ef7,eb85019c1081..8945afd6ce3e
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@@ -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[] = {
diff --cc drivers/net/wireless/libertas_tf/if_usb.c
index 8cc9db60c14b,827b7dc306b0..4412c279ca94
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@@ -11,13 -18,10 +18,11 @@@
  #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
  
diff --cc drivers/net/wireless/libertas_tf/main.c
index 7533a23e0500,895b557d664e..60787de56f3a
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@@ -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 */
diff --cc drivers/net/wireless/orinoco/hw.c
index 741f8cea95b9,9c86acc42794..6fbd78850123
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@@ -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);