diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2015-12-29 18:44:19 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-12-29 18:44:19 +0200 |
| commit | 5a1f052d59c21b603bcbadeb296b1574a6cc2d6d (patch) | |
| tree | 4122601e0ca6c450dd629f53d689fac07857b7c4 /drivers/net/wireless/intel/iwlwifi/dvm/agn.h | |
| parent | 541c9a84cd85203244307d9ebb821102eed82789 (diff) | |
| parent | e5d15cb530082cc13a6c9457eddd6f75b0f4de65 (diff) | |
| download | talos-op-linux-5a1f052d59c21b603bcbadeb296b1574a6cc2d6d.tar.gz talos-op-linux-5a1f052d59c21b603bcbadeb296b1574a6cc2d6d.zip | |
Merge tag 'iwlwifi-next-for-kalle-2015-12-21' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* Make scan parameters low latency aware (Avi Stern)
* Fix in the NL80211_FEATURE_FULL_AP_CLIENT_STATE state case (Ayala)
* Fix enable injection mode (Chaya Rachel)
* Various cleanups (Dan / Julia / myself)
* Allow to stay more time on popular channels (David Spinadel)
* Bug fixes for D0i3 (Eliad / Luca)
* Fixes for GO uAPSD (myself)
* Start of TSO support (myself)
* Rate control bug fixes (Eyal / Gregory)
* Start the work on 9000 devices (Johannes / Sara / Oren)
* Start the work on a new Tx queue allocation model (Liad)
* Debug infrastructure enhancements (Golan)
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/agn.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h index 991def878881..9de277c6c420 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h +++ b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h @@ -25,7 +25,7 @@ * in the file called COPYING. * * Contact Information: - * Intel Linux Wireless <ilw@linux.intel.com> + * Intel Linux Wireless <linuxwifi@intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * * BSD LICENSE @@ -473,13 +473,4 @@ do { \ } while (0) #endif /* CONFIG_IWLWIFI_DEBUG */ -extern const char *const iwl_dvm_cmd_strings[REPLY_MAX + 1]; - -static inline const char *iwl_dvm_get_cmd_string(u8 cmd) -{ - const char *s = iwl_dvm_cmd_strings[cmd]; - if (s) - return s; - return "UNKNOWN"; -} #endif /* __iwl_agn_h__ */ |
