From: David S. Miller <davem@davemloft.net>
Date: Fri, 26 Sep 2014 19:19:05 +0000 (-0400)
Subject: Merge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... 
X-Git-Tag: v3.18-rc1~115^2~144
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=57219dc7bfc5cae48c8309974054733499a0dc63;p=linux.git

Merge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-09-22

Please pull this batch of updates intended for the 3.18 stream...

For the mac80211 bits, Johannes says:

"This time, I have some rate minstrel improvements, support for a very
small feature from CCX that Steinar reverse-engineered, dynamic ACK
timeout support, a number of changes for TDLS, early support for radio
resource measurement and many fixes. Also, I'm changing a number of
places to clear key memory when it's freed and Intel claims copyright
for code they developed."

For the bluetooth bits, Johan says:

"Here are some more patches intended for 3.18. Most of them are cleanups
or fixes for SMP. The only exception is a fix for BR/EDR L2CAP fixed
channels which should now work better together with the L2CAP
information request procedure."

For the iwlwifi bits, Emmanuel says:

"I fix here dvm which was broken by my last pull request. Arik
continues to work on TDLS and Luca solved a few issues in CT-Kill. Eyal
keeps digging into rate scaling code, more to come soon. Besides this,
nothing really special here."

Beyond that, there are the usual big batches of updates to ath9k, b43,
mwifiex, and wil6210 as well as a handful of other bits here and there.
Also, rtlwifi gets some btcoexist attention from Larry.

Please let me know if there are problems!
====================

Had to adjust the wil6210 code to comply with Joe Perches's recent
change in net-next to make the netdev_*() routines return void instead
of 'int'.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

57219dc7bfc5cae48c8309974054733499a0dc63
diff --cc drivers/net/wireless/ath/wil6210/debug.c
index 9eeabf4a5879,9eeabf4a5879..8d99021d27a8
--- a/drivers/net/wireless/ath/wil6210/debug.c
+++ b/drivers/net/wireless/ath/wil6210/debug.c
@@@ -17,43 -17,43 +17,37 @@@
  #include "wil6210.h"
  #include "trace.h"
  
--int wil_err(struct wil6210_priv *wil, const char *fmt, ...)
++void wil_err(struct wil6210_priv *wil, const char *fmt, ...)
  {
  	struct net_device *ndev = wil_to_ndev(wil);
  	struct va_format vaf = {
  		.fmt = fmt,
  	};
  	va_list args;
--	int ret;
  
  	va_start(args, fmt);
  	vaf.va = &args;
--	ret = netdev_err(ndev, "%pV", &vaf);
++	netdev_err(ndev, "%pV", &vaf);
  	trace_wil6210_log_err(&vaf);
  	va_end(args);
--
--	return ret;
  }
  
--int wil_info(struct wil6210_priv *wil, const char *fmt, ...)
++void wil_info(struct wil6210_priv *wil, const char *fmt, ...)
  {
  	struct net_device *ndev = wil_to_ndev(wil);
  	struct va_format vaf = {
  		.fmt = fmt,
  	};
  	va_list args;
--	int ret;
  
  	va_start(args, fmt);
  	vaf.va = &args;
--	ret = netdev_info(ndev, "%pV", &vaf);
++	netdev_info(ndev, "%pV", &vaf);
  	trace_wil6210_log_info(&vaf);
  	va_end(args);
--
--	return ret;
  }
  
--int wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...)
++void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...)
  {
  	struct va_format vaf = {
  		.fmt = fmt,
@@@ -64,6 -64,6 +58,4 @@@
  	vaf.va = &args;
  	trace_wil6210_log_dbg(&vaf);
  	va_end(args);
--
--	return 0;
  }
diff --cc drivers/net/wireless/ath/wil6210/wil6210.h
index f8718fe547c4,133eeb84ffad..41aa79327584
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@@ -435,10 -449,11 +449,11 @@@ struct wil6210_priv 
  #define wdev_to_wil(w) (struct wil6210_priv *)(wdev_priv(w))
  #define wil_to_ndev(i) (wil_to_wdev(i)->netdev)
  #define ndev_to_wil(n) (wdev_to_wil(n->ieee80211_ptr))
+ #define wil_to_pcie_dev(i) (&i->pdev->dev)
  
--int wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);
--int wil_err(struct wil6210_priv *wil, const char *fmt, ...);
--int wil_info(struct wil6210_priv *wil, const char *fmt, ...);
++void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);
++void wil_err(struct wil6210_priv *wil, const char *fmt, ...);
++void wil_info(struct wil6210_priv *wil, const char *fmt, ...);
  #define wil_dbg(wil, fmt, arg...) do { \
  	netdev_dbg(wil_to_ndev(wil), fmt, ##arg); \
  	wil_dbg_trace(wil, fmt, ##arg); \