diff options
| author | Mikael Kanstrup <mikael.kanstrup@gmail.com> | 2016-02-07 00:40:51 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-01 15:23:44 +0000 |
| commit | 9f27e5d7d19027ddf8f29c5a6a321912e7c2f9dd (patch) | |
| tree | df58180c18aa9d7c05086ac41d2beb445fcc8590 /ui | |
| parent | 7a1f75ed2f91f212317902020ab762ebaa3098ad (diff) | |
| download | wireshark-9f27e5d7d19027ddf8f29c5a6a321912e7c2f9dd.tar.gz | |
dumpcap: Add support for 802.11ac monitor modes
Add dumpcap support for configuring 80MHz, 80+80MHz, 160MHz monitor
modes via nl80211.
Change-Id: I2ae8955670c2a9b5051e2223d45ce522459f2c5f
Reviewed-on: https://code.wireshark.org/review/13964
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main_80211_toolbar.c | 2 | ||||
| -rw-r--r-- | ui/qt/wireless_frame.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c index d1b58ea768..a844ef7159 100644 --- a/ui/gtk/main_80211_toolbar.c +++ b/ui/gtk/main_80211_toolbar.c @@ -170,7 +170,7 @@ tb80211_do_set_channel(char *iface, int freq, int type) freq_s = g_strdup_printf("%d", freq); type_s = ws80211_chan_type_to_str(type); - ret = sync_interface_set_80211_chan(iface, freq_s, type_s, + ret = sync_interface_set_80211_chan(iface, freq_s, type_s, "-1", "-1", &data, &primary_msg, &secondary_msg, main_window_update); /* Parse the error msg */ diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp index 4ba38f363e..67b139439e 100644 --- a/ui/qt/wireless_frame.cpp +++ b/ui/qt/wireless_frame.cpp @@ -265,7 +265,8 @@ void WirelessFrame::setInterfaceInfo() if (frequency.isEmpty() || chan_type < 0) return; - ret = sync_interface_set_80211_chan(cur_iface.toUtf8().constData(), frequency.toUtf8().constData(), chan_type_s, + ret = sync_interface_set_80211_chan(cur_iface.toUtf8().constData(), frequency.toUtf8().constData(), + chan_type_s, "-1", "-1", &data, &primary_msg, &secondary_msg, main_window_update); g_free(data); @@ -282,7 +283,7 @@ void WirelessFrame::setInterfaceInfo() int chan_type = ui->channelTypeComboBox->itemData(cur_type_idx).toInt(); if (frequency < 0 || chan_type < 0) return; - if (ws80211_set_freq(cur_iface.toUtf8().constData(), frequency, chan_type) != 0) { + if (ws80211_set_freq(cur_iface.toUtf8().constData(), frequency, chan_type, -1, -1) != 0) { QString err_str = tr("Unable to set channel or offset."); emit pushAdapterStatus(err_str); } |