From fb8c10a3705e07b91ac90df00623aef3e3b01cfd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 9 Jan 2006 04:36:46 +0000 Subject: [PATCH] 2006-01-08 Dan Williams We now require a patch for wpa_supplicant to support Ad-Hoc networks: http://people.redhat.com/dcbw/wpa_supplicant-ctrl-iface-ap-scan.patch * src/nm-device-802-11-wireless.c - (supplicant_send_network_config): turn off wpa_supplicant's scanning. Fixes Ad-Hoc networks. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1299 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 ++++++++++ src/nm-device-802-11-wireless.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index 65fcaf7f68..b82ac3c91a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-01-08 Dan Williams + + We now require a patch for wpa_supplicant to support Ad-Hoc + networks: + http://people.redhat.com/dcbw/wpa_supplicant-ctrl-iface-ap-scan.patch + + * src/nm-device-802-11-wireless.c + - (supplicant_send_network_config): turn off wpa_supplicant's + scanning. Fixes Ad-Hoc networks. + 2006-01-08 Dan Williams * src/nm-ap-security.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index a720794beb..409aba0a2d 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -2432,6 +2432,11 @@ supplicant_send_network_config (NMDevice80211Wireless *self, ctrl = self->priv->sup_ctrl; g_assert (ctrl); + /* Tell wpa_supplicant that we'll do the scanning */ + if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, + "AP_SCAN 2")) + goto out; + /* Standard network setup info */ if (!(response = nm_utils_supplicant_request (ctrl, "ADD_NETWORK"))) {