diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-18 20:17:13 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-18 20:27:48 +0200 |
| commit | 59ef43e681d103a51c3727dad0315e093f07ec61 (patch) | |
| tree | 87f6320f1440ce3ce6c0c15ad3cef8bc98186f88 /net/wireless/scan.c | |
| parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
| parent | mwifiex: corrections in timestamp related code (diff) | |
| download | linux-59ef43e681d103a51c3727dad0315e093f07ec61.tar.xz linux-59ef43e681d103a51c3727dad0315e093f07ec61.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
include/net/nfc/nfc.h
net/nfc/netlink.c
net/wireless/nl80211.c
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index fdbcfe692a36..1442bb68a3f3 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -18,7 +18,7 @@ #include "nl80211.h" #include "wext-compat.h" -#define IEEE80211_SCAN_RESULT_EXPIRE (15 * HZ) +#define IEEE80211_SCAN_RESULT_EXPIRE (30 * HZ) void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak) { |