diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-04-01 13:06:00 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-04-01 20:31:14 +0000 |
| commit | 0975bf792a5609157349053385badca1f9c29cd7 (patch) | |
| tree | 02d86aaa3294b2149865145873c49f064116de85 /ui | |
| parent | 8e5007442e73884b44b5cb204d9179d587607809 (diff) | |
Handle -k better on platforms that don't support it.
Have ws80211_init() return an indication that channel setting isn't
supported on those platforms.
In dumpcap, try to set up ws80211 before checking the channel argument
and, if it fails, report the failure, rather than failing because the
"convert channel name to channel code" routine fails.
See
https://ask.wireshark.org/question/15535/dumpcap-k-is-not-accepting-channel-type-values/
for an example of confusion caused by the previous behavior.
Change-Id: I303f560704700bbcd4f0ecea041f8632744212f3
Reviewed-on: https://code.wireshark.org/review/36659
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/wireless_frame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp index 276138fd8b..d812a6eb3e 100644 --- a/ui/qt/wireless_frame.cpp +++ b/ui/qt/wireless_frame.cpp @@ -50,7 +50,7 @@ WirelessFrame::WirelessFrame(QWidget *parent) : ui->helperToolButton->hide(); - if (ws80211_init() == 0) { + if (ws80211_init() == WS80211_INIT_OK) { ui->stackedWidget->setEnabled(true); ui->stackedWidget->setCurrentWidget(ui->interfacePage); |