diff options
-rw-r--r-- | drivers/net/wireless/wl12xx/conf.h | 18 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h index 135d837cefb1..fd1dac9ab4db 100644 --- a/drivers/net/wireless/wl12xx/conf.h +++ b/drivers/net/wireless/wl12xx/conf.h | |||
@@ -1084,30 +1084,30 @@ struct conf_scan_settings { | |||
1084 | /* | 1084 | /* |
1085 | * The minimum time to wait on each channel for active scans | 1085 | * The minimum time to wait on each channel for active scans |
1086 | * | 1086 | * |
1087 | * Range: 0 - 65536 tu | 1087 | * Range: u32 tu/1000 |
1088 | */ | 1088 | */ |
1089 | u16 min_dwell_time_active; | 1089 | u32 min_dwell_time_active; |
1090 | 1090 | ||
1091 | /* | 1091 | /* |
1092 | * The maximum time to wait on each channel for active scans | 1092 | * The maximum time to wait on each channel for active scans |
1093 | * | 1093 | * |
1094 | * Range: 0 - 65536 tu | 1094 | * Range: u32 tu/1000 |
1095 | */ | 1095 | */ |
1096 | u16 max_dwell_time_active; | 1096 | u32 max_dwell_time_active; |
1097 | 1097 | ||
1098 | /* | 1098 | /* |
1099 | * The maximum time to wait on each channel for passive scans | 1099 | * The minimum time to wait on each channel for passive scans |
1100 | * | 1100 | * |
1101 | * Range: 0 - 65536 tu | 1101 | * Range: u32 tu/1000 |
1102 | */ | 1102 | */ |
1103 | u16 min_dwell_time_passive; | 1103 | u32 min_dwell_time_passive; |
1104 | 1104 | ||
1105 | /* | 1105 | /* |
1106 | * The maximum time to wait on each channel for passive scans | 1106 | * The maximum time to wait on each channel for passive scans |
1107 | * | 1107 | * |
1108 | * Range: 0 - 65536 tu | 1108 | * Range: u32 tu/1000 |
1109 | */ | 1109 | */ |
1110 | u16 max_dwell_time_passive; | 1110 | u32 max_dwell_time_passive; |
1111 | 1111 | ||
1112 | /* | 1112 | /* |
1113 | * Number of probe requests to transmit on each active scan channel | 1113 | * Number of probe requests to transmit on each active scan channel |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index eda2f3d8edf1..e535e79e269d 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -279,8 +279,8 @@ static struct conf_drv_settings default_conf = { | |||
279 | .scan = { | 279 | .scan = { |
280 | .min_dwell_time_active = 7500, | 280 | .min_dwell_time_active = 7500, |
281 | .max_dwell_time_active = 30000, | 281 | .max_dwell_time_active = 30000, |
282 | .min_dwell_time_passive = 30000, | 282 | .min_dwell_time_passive = 100000, |
283 | .max_dwell_time_passive = 60000, | 283 | .max_dwell_time_passive = 100000, |
284 | .num_probe_reqs = 2, | 284 | .num_probe_reqs = 2, |
285 | }, | 285 | }, |
286 | .rf = { | 286 | .rf = { |