diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-10 22:49:55 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-10 22:49:55 +0400 |
| commit | 4511a4a50e1a8757f771681c3e92dbf5a928eeac (patch) | |
| tree | b2633127dd71bbc0174e20ebba02edf4f955de5c /drivers/net/wireless/ath/main.c | |
| parent | 3dab99e0b37e16525949757f46e33fb9612c73ec (diff) | |
| parent | 1fca350b761631d182c2e8bce530896e66404bc2 (diff) | |
| download | linux-4511a4a50e1a8757f771681c3e92dbf5a928eeac.tar.xz | |
Merge tag 'master-2014-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
pull request: wireless-next 2014-10-09
Please pull this batch of fixes intended for the 3.18 stream!
Andrea Merello makes rtl818x_pci use a more reasonable transmission
rate for HW generated frames.
Fabian Frederick tweaks some kernel-doc bits to avoid warnings.
Larry Finger corrects a possible unaligned access in the rtlwifi code.
Marek Puzyniak avoids a kernel panic in ath9k_hw_reset.
Sujith Manoharan goes for the hat trick -- he fixes a smatch warning
in the shared ath code, he fixes a crash in ath9k, and he corrects
a sequence number assignment problem in ath9k too.
For ease of merging, I pulled the last bits of the wireless tree as well...
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c index 83f47af19280..338d72337604 100644 --- a/drivers/net/wireless/ath/main.c +++ b/drivers/net/wireless/ath/main.c @@ -79,13 +79,13 @@ void ath_printk(const char *level, const struct ath_common* common, vaf.fmt = fmt; vaf.va = &args; - if (common && common->hw && common->hw->wiphy) + if (common && common->hw && common->hw->wiphy) { printk("%sath: %s: %pV", level, wiphy_name(common->hw->wiphy), &vaf); - else + trace_ath_log(common->hw->wiphy, &vaf); + } else { printk("%sath: %pV", level, &vaf); - - trace_ath_log(common->hw->wiphy, &vaf); + } va_end(args); } |