diff options
| author | John W. Linville <[email protected]> | 2013-05-20 19:19:01 +0000 |
|---|---|---|
| committer | John W. Linville <[email protected]> | 2013-05-20 19:19:01 +0000 |
| commit | ba7c96bec59d1c11cf9eaf6489e70e22f53da31b (patch) | |
| tree | 6d5c92ee3b4fa2d422f11d05da308a7cde614a5f /drivers/net/wireless/iwlegacy/common.c | |
| parent | bnx2x: Fix GSO for 57710/57711 chips (diff) | |
| parent | ath9k: fix draining aggregation tid buffers (diff) | |
| download | kernel-ba7c96bec59d1c11cf9eaf6489e70e22f53da31b.tar.gz kernel-ba7c96bec59d1c11cf9eaf6489e70e22f53da31b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 592d0aa634a8..e9a3cbc409ae 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c @@ -1423,7 +1423,7 @@ il_setup_rx_scan_handlers(struct il_priv *il) } EXPORT_SYMBOL(il_setup_rx_scan_handlers); -inline u16 +u16 il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band, u8 n_probes) { |