diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2017-01-31 10:17:51 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2017-01-31 10:17:51 +0000 |
| commit | be767e046b11d04a3f8a548269083becb1e6c45f (patch) | |
| tree | 81ed7e8751953952db6ba1baea0c2e2d550b0d61 /sys/dev | |
| parent | 14ff8d68c512b2066106954945770642cb510260 (diff) | |
Update the struct iwm_scan_results_notif to FW Api version 3, and remove
the unused enum iwm_scan_complete_status status codes.
This corresponds to parts of the Linux iwlwifi commits
1083fd7391e989be52022f0f338e9dadc048b063 and
75118fdb63496e4611ab50380499ddd62b9de69f.
No functional change, since struct iwm_scan_results_notif isn't accessed
in iwm at the moment.
Patch by Imre Vadasz.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_iwmreg.h | 43 |
1 files changed, 4 insertions, 39 deletions
diff --git a/sys/dev/pci/if_iwmreg.h b/sys/dev/pci/if_iwmreg.h index 908a04fdac6..ab34cc18a80 100644 --- a/sys/dev/pci/if_iwmreg.h +++ b/sys/dev/pci/if_iwmreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwmreg.h,v 1.23 2017/01/29 09:43:50 stsp Exp $ */ +/* $OpenBSD: if_iwmreg.h,v 1.24 2017/01/31 10:17:50 stsp Exp $ */ /****************************************************************************** * @@ -4864,48 +4864,14 @@ struct iwm_periodic_scan_complete { uint32_t reserved; } __packed; -/* How many statistics are gathered for each channel */ -#define IWM_SCAN_RESULTS_STATISTICS 1 - /** - * status codes for scan complete notifications - * @IWM_SCAN_COMP_STATUS_OK: scan completed successfully - * @IWM_SCAN_COMP_STATUS_ABORT: scan was aborted by user - * @IWM_SCAN_COMP_STATUS_ERR_SLEEP: sending null sleep packet failed - * @IWM_SCAN_COMP_STATUS_ERR_CHAN_TIMEOUT: timeout before channel is ready - * @IWM_SCAN_COMP_STATUS_ERR_PROBE: sending probe request failed - * @IWM_SCAN_COMP_STATUS_ERR_WAKEUP: sending null wakeup packet failed - * @IWM_SCAN_COMP_STATUS_ERR_ANTENNAS: invalid antennas chosen at scan command - * @IWM_SCAN_COMP_STATUS_ERR_INTERNAL: internal error caused scan abort - * @IWM_SCAN_COMP_STATUS_ERR_COEX: medium was lost ot WiMax - * @IWM_SCAN_COMP_STATUS_P2P_ACTION_OK: P2P public action frame TX was successful - * (not an error!) - * @IWM_SCAN_COMP_STATUS_ITERATION_END: indicates end of one repeatition the driver - * asked for - * @IWM_SCAN_COMP_STATUS_ERR_ALLOC_TE: scan could not allocate time events -*/ -#define IWM_SCAN_COMP_STATUS_OK 0x1 -#define IWM_SCAN_COMP_STATUS_ABORT 0x2 -#define IWM_SCAN_COMP_STATUS_ERR_SLEEP 0x3 -#define IWM_SCAN_COMP_STATUS_ERR_CHAN_TIMEOUT 0x4 -#define IWM_SCAN_COMP_STATUS_ERR_PROBE 0x5 -#define IWM_SCAN_COMP_STATUS_ERR_WAKEUP 0x6 -#define IWM_SCAN_COMP_STATUS_ERR_ANTENNAS 0x7 -#define IWM_SCAN_COMP_STATUS_ERR_INTERNAL 0x8 -#define IWM_SCAN_COMP_STATUS_ERR_COEX 0x9 -#define IWM_SCAN_COMP_STATUS_P2P_ACTION_OK 0xA -#define IWM_SCAN_COMP_STATUS_ITERATION_END 0x0B -#define IWM_SCAN_COMP_STATUS_ERR_ALLOC_TE 0x0C - -/** - * struct iwm_scan_results_notif - scan results for one channel - * ( IWM_SCAN_RESULTS_NOTIFICATION = 0x83 ) + * struct iwm_scan_results_notif - scan results for one channel - + * SCAN_RESULT_NTF_API_S_VER_3 * @channel: which channel the results are from * @band: 0 for 5.2 GHz, 1 for 2.4 GHz * @probe_status: IWM_SCAN_PROBE_STATUS_*, indicates success of probe request * @num_probe_not_sent: # of request that weren't sent due to not enough time * @duration: duration spent in channel, in usecs - * @statistics: statistics gathered for this channel */ struct iwm_scan_results_notif { uint8_t channel; @@ -4913,8 +4879,7 @@ struct iwm_scan_results_notif { uint8_t probe_status; uint8_t num_probe_not_sent; uint32_t duration; - uint32_t statistics[IWM_SCAN_RESULTS_STATISTICS]; -} __packed; /* IWM_SCAN_RESULT_NTF_API_S_VER_2 */ +} __packed; #define IWM_SCAN_CLIENT_SCHED_SCAN (1 << 0) #define IWM_SCAN_CLIENT_NETDETECT (1 << 1) |