diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 00:41:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 00:41:53 -0400 |
| commit | f3032be921cd126615ce3bfd7084e3d319f3f892 (patch) | |
| tree | c2ce874f2ab7f107dddf7b854772e0f3b64d35a1 /drivers/net/wireless/hostap/hostap_hw.c | |
| parent | 70c03b49b80ba3634958acc31853771019c0ebd3 (diff) | |
| parent | 18d7260527ce7c0d0a177afdf92d8f868f50b067 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_hw.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index cdf90c40f11..79a9bc95d2a 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
| @@ -3204,6 +3204,7 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx, | |||
| 3204 | local->auth_algs = PRISM2_AUTH_OPEN | PRISM2_AUTH_SHARED_KEY; | 3204 | local->auth_algs = PRISM2_AUTH_OPEN | PRISM2_AUTH_SHARED_KEY; |
| 3205 | local->sram_type = -1; | 3205 | local->sram_type = -1; |
| 3206 | local->scan_channel_mask = 0xffff; | 3206 | local->scan_channel_mask = 0xffff; |
| 3207 | local->monitor_type = PRISM2_MONITOR_RADIOTAP; | ||
| 3207 | 3208 | ||
| 3208 | /* Initialize task queue structures */ | 3209 | /* Initialize task queue structures */ |
| 3209 | INIT_WORK(&local->reset_queue, handle_reset_queue); | 3210 | INIT_WORK(&local->reset_queue, handle_reset_queue); |