2009-04-19 21:24:32 +02:00
|
|
|
/*
|
|
|
|
* Some IBSS support code for cfg80211.
|
|
|
|
*
|
|
|
|
* Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/if_arp.h>
|
|
|
|
#include <net/cfg80211.h>
|
2009-07-27 12:01:50 +02:00
|
|
|
#include "wext-compat.h"
|
2009-04-19 21:24:32 +02:00
|
|
|
#include "nl80211.h"
|
|
|
|
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid)
|
2009-04-19 21:24:32 +02:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct cfg80211_bss *bss;
|
2009-09-29 23:27:28 +02:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-04-19 21:24:32 +02:00
|
|
|
union iwreq_data wrqu;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
|
|
|
|
return;
|
|
|
|
|
2009-08-21 12:23:49 +02:00
|
|
|
if (!wdev->ssid_len)
|
2009-04-19 21:24:32 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
|
|
|
|
wdev->ssid, wdev->ssid_len,
|
|
|
|
WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
|
|
|
|
|
|
|
|
if (WARN_ON(!bss))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (wdev->current_bss) {
|
|
|
|
cfg80211_unhold_bss(wdev->current_bss);
|
2009-07-02 17:20:43 +02:00
|
|
|
cfg80211_put_bss(&wdev->current_bss->pub);
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
2009-07-02 17:20:43 +02:00
|
|
|
cfg80211_hold_bss(bss_from_pub(bss));
|
|
|
|
wdev->current_bss = bss_from_pub(bss);
|
2009-04-19 21:24:32 +02:00
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
cfg80211_upload_connect_keys(wdev);
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
nl80211_send_ibss_bssid(wiphy_to_dev(wdev->wiphy), dev, bssid,
|
|
|
|
GFP_KERNEL);
|
2009-09-29 23:27:28 +02:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-04-19 21:24:32 +02:00
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
|
|
|
|
wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
|
|
|
|
#endif
|
|
|
|
}
|
2009-07-07 03:56:11 +02:00
|
|
|
|
|
|
|
void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
struct cfg80211_event *ev;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2009-08-21 12:23:49 +02:00
|
|
|
CFG80211_DEV_WARN_ON(!wdev->ssid_len);
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
ev = kzalloc(sizeof(*ev), gfp);
|
|
|
|
if (!ev)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ev->type = EVENT_IBSS_JOINED;
|
|
|
|
memcpy(ev->cr.bssid, bssid, ETH_ALEN);
|
|
|
|
|
|
|
|
spin_lock_irqsave(&wdev->event_lock, flags);
|
|
|
|
list_add_tail(&ev->list, &wdev->event_list);
|
|
|
|
spin_unlock_irqrestore(&wdev->event_lock, flags);
|
|
|
|
schedule_work(&rdev->event_work);
|
|
|
|
}
|
2009-04-19 21:24:32 +02:00
|
|
|
EXPORT_SYMBOL(cfg80211_ibss_joined);
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev,
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
struct cfg80211_ibss_params *params,
|
|
|
|
struct cfg80211_cached_keys *connkeys)
|
2009-04-19 21:24:32 +02:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-08-07 17:22:35 +02:00
|
|
|
struct ieee80211_channel *chan;
|
2009-04-19 21:24:32 +02:00
|
|
|
int err;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
chan = rdev_fixed_channel(rdev, wdev);
|
|
|
|
if (chan && chan != params->channel)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2009-04-19 21:24:32 +02:00
|
|
|
if (wdev->ssid_len)
|
|
|
|
return -EALREADY;
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
if (WARN_ON(wdev->connect_keys))
|
|
|
|
kfree(wdev->connect_keys);
|
|
|
|
wdev->connect_keys = connkeys;
|
|
|
|
|
2009-09-29 23:27:28 +02:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-05-09 20:09:03 +02:00
|
|
|
wdev->wext.ibss.channel = params->channel;
|
2009-04-19 21:24:32 +02:00
|
|
|
#endif
|
|
|
|
err = rdev->ops->join_ibss(&rdev->wiphy, dev, params);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
if (err) {
|
|
|
|
wdev->connect_keys = NULL;
|
2009-04-19 21:24:32 +02:00
|
|
|
return err;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
}
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
memcpy(wdev->ssid, params->ssid, params->ssid_len);
|
|
|
|
wdev->ssid_len = params->ssid_len;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
int cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev,
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
struct cfg80211_ibss_params *params,
|
|
|
|
struct cfg80211_cached_keys *connkeys)
|
2009-07-07 03:56:11 +02:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
int err;
|
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_lock(&rdev->devlist_mtx);
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_lock(wdev);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
err = __cfg80211_join_ibss(rdev, dev, params, connkeys);
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_unlock(wdev);
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_unlock(&rdev->devlist_mtx);
|
2009-07-07 03:56:11 +02:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext)
|
2009-04-19 21:24:32 +02:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
int i;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
kfree(wdev->connect_keys);
|
|
|
|
wdev->connect_keys = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Delete all the keys ... pairwise keys can't really
|
|
|
|
* exist any more anyway, but default keys might.
|
|
|
|
*/
|
|
|
|
if (rdev->ops->del_key)
|
|
|
|
for (i = 0; i < 6; i++)
|
|
|
|
rdev->ops->del_key(wdev->wiphy, dev, i, NULL);
|
|
|
|
|
2009-04-19 21:24:32 +02:00
|
|
|
if (wdev->current_bss) {
|
|
|
|
cfg80211_unhold_bss(wdev->current_bss);
|
2009-07-02 17:20:43 +02:00
|
|
|
cfg80211_put_bss(&wdev->current_bss->pub);
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
wdev->current_bss = NULL;
|
|
|
|
wdev->ssid_len = 0;
|
2009-09-29 23:27:28 +02:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
2009-04-20 18:43:46 +02:00
|
|
|
if (!nowext)
|
2009-05-09 20:09:03 +02:00
|
|
|
wdev->wext.ibss.ssid_len = 0;
|
2009-04-20 18:43:46 +02:00
|
|
|
#endif
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
void cfg80211_clear_ibss(struct net_device *dev, bool nowext)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
|
|
|
|
wdev_lock(wdev);
|
|
|
|
__cfg80211_clear_ibss(dev, nowext);
|
|
|
|
wdev_unlock(wdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev, bool nowext)
|
2009-04-19 21:24:32 +02:00
|
|
|
{
|
2009-07-07 03:56:05 +02:00
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-04-19 21:24:32 +02:00
|
|
|
int err;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
|
|
|
|
2009-07-07 03:56:05 +02:00
|
|
|
if (!wdev->ssid_len)
|
|
|
|
return -ENOLINK;
|
|
|
|
|
2009-04-19 21:24:32 +02:00
|
|
|
err = rdev->ops->leave_ibss(&rdev->wiphy, dev);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
__cfg80211_clear_ibss(dev, nowext);
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev,
|
|
|
|
struct net_device *dev, bool nowext)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
wdev_lock(wdev);
|
|
|
|
err = __cfg80211_leave_ibss(rdev, dev, nowext);
|
|
|
|
wdev_unlock(wdev);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-09-29 23:27:28 +02:00
|
|
|
#ifdef CONFIG_CFG80211_WEXT
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
|
|
|
|
struct wireless_dev *wdev)
|
2009-04-19 21:24:32 +02:00
|
|
|
{
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
struct cfg80211_cached_keys *ck = NULL;
|
2009-04-19 21:24:32 +02:00
|
|
|
enum ieee80211_band band;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
int i, err;
|
|
|
|
|
|
|
|
ASSERT_WDEV_LOCK(wdev);
|
2009-04-19 21:24:32 +02:00
|
|
|
|
2009-05-09 20:09:03 +02:00
|
|
|
if (!wdev->wext.ibss.beacon_interval)
|
|
|
|
wdev->wext.ibss.beacon_interval = 100;
|
2009-04-22 17:45:38 +02:00
|
|
|
|
2009-04-19 21:24:32 +02:00
|
|
|
/* try to find an IBSS channel if none requested ... */
|
2009-05-09 20:09:03 +02:00
|
|
|
if (!wdev->wext.ibss.channel) {
|
2009-04-19 21:24:32 +02:00
|
|
|
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
|
|
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
struct ieee80211_channel *chan;
|
|
|
|
|
|
|
|
sband = rdev->wiphy.bands[band];
|
|
|
|
if (!sband)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (i = 0; i < sband->n_channels; i++) {
|
|
|
|
chan = &sband->channels[i];
|
|
|
|
if (chan->flags & IEEE80211_CHAN_NO_IBSS)
|
|
|
|
continue;
|
|
|
|
if (chan->flags & IEEE80211_CHAN_DISABLED)
|
|
|
|
continue;
|
2009-05-09 20:09:03 +02:00
|
|
|
wdev->wext.ibss.channel = chan;
|
2009-04-19 21:24:32 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-05-09 20:09:03 +02:00
|
|
|
if (wdev->wext.ibss.channel)
|
2009-04-19 21:24:32 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-05-09 20:09:03 +02:00
|
|
|
if (!wdev->wext.ibss.channel)
|
2009-04-19 21:24:32 +02:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* don't join -- SSID is not there */
|
2009-05-09 20:09:03 +02:00
|
|
|
if (!wdev->wext.ibss.ssid_len)
|
2009-04-19 21:24:32 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!netif_running(wdev->netdev))
|
|
|
|
return 0;
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
if (wdev->wext.keys)
|
|
|
|
wdev->wext.keys->def = wdev->wext.default_key;
|
|
|
|
|
|
|
|
wdev->wext.ibss.privacy = wdev->wext.default_key != -1;
|
|
|
|
|
|
|
|
if (wdev->wext.keys) {
|
|
|
|
ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
|
|
|
|
if (!ck)
|
|
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < 6; i++)
|
|
|
|
ck->params[i].key = ck->data[i];
|
|
|
|
}
|
|
|
|
err = __cfg80211_join_ibss(rdev, wdev->netdev,
|
|
|
|
&wdev->wext.ibss, ck);
|
|
|
|
if (err)
|
|
|
|
kfree(ck);
|
|
|
|
|
|
|
|
return err;
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
|
|
|
|
struct iw_request_info *info,
|
2009-08-07 17:22:35 +02:00
|
|
|
struct iw_freq *wextfreq, char *extra)
|
2009-04-19 21:24:32 +02:00
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-08-07 17:22:35 +02:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
|
|
|
struct ieee80211_channel *chan = NULL;
|
|
|
|
int err, freq;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
/* call only for ibss! */
|
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
if (!rdev->ops->join_ibss)
|
2009-04-19 21:24:32 +02:00
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
freq = cfg80211_wext_freq(wdev->wiphy, wextfreq);
|
|
|
|
if (freq < 0)
|
|
|
|
return freq;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
if (freq) {
|
|
|
|
chan = ieee80211_get_channel(wdev->wiphy, freq);
|
|
|
|
if (!chan)
|
|
|
|
return -EINVAL;
|
|
|
|
if (chan->flags & IEEE80211_CHAN_NO_IBSS ||
|
|
|
|
chan->flags & IEEE80211_CHAN_DISABLED)
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-04-19 21:24:32 +02:00
|
|
|
|
2009-05-09 20:09:03 +02:00
|
|
|
if (wdev->wext.ibss.channel == chan)
|
2009-04-19 21:24:32 +02:00
|
|
|
return 0;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_lock(wdev);
|
|
|
|
err = 0;
|
|
|
|
if (wdev->ssid_len)
|
2009-08-07 17:22:35 +02:00
|
|
|
err = __cfg80211_leave_ibss(rdev, dev, true);
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_unlock(wdev);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
return err;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
if (chan) {
|
2009-05-09 20:09:03 +02:00
|
|
|
wdev->wext.ibss.channel = chan;
|
|
|
|
wdev->wext.ibss.channel_fixed = true;
|
2009-04-19 21:24:32 +02:00
|
|
|
} else {
|
|
|
|
/* cfg80211_ibss_wext_join will pick one if needed */
|
2009-05-09 20:09:03 +02:00
|
|
|
wdev->wext.ibss.channel_fixed = false;
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_lock(&rdev->devlist_mtx);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
wdev_lock(wdev);
|
2009-08-07 17:22:35 +02:00
|
|
|
err = cfg80211_ibss_wext_join(rdev, wdev);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
wdev_unlock(wdev);
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_unlock(&rdev->devlist_mtx);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
|
|
|
|
return err;
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int cfg80211_ibss_wext_giwfreq(struct net_device *dev,
|
|
|
|
struct iw_request_info *info,
|
|
|
|
struct iw_freq *freq, char *extra)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
struct ieee80211_channel *chan = NULL;
|
|
|
|
|
|
|
|
/* call only for ibss! */
|
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_lock(wdev);
|
2009-04-19 21:24:32 +02:00
|
|
|
if (wdev->current_bss)
|
2009-07-02 17:20:43 +02:00
|
|
|
chan = wdev->current_bss->pub.channel;
|
2009-05-09 20:09:03 +02:00
|
|
|
else if (wdev->wext.ibss.channel)
|
|
|
|
chan = wdev->wext.ibss.channel;
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_unlock(wdev);
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
if (chan) {
|
|
|
|
freq->m = chan->center_freq;
|
|
|
|
freq->e = 6;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* no channel if not joining */
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cfg80211_ibss_wext_siwessid(struct net_device *dev,
|
|
|
|
struct iw_request_info *info,
|
|
|
|
struct iw_point *data, char *ssid)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-08-07 17:22:35 +02:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
2009-04-19 21:24:32 +02:00
|
|
|
size_t len = data->length;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* call only for ibss! */
|
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
if (!rdev->ops->join_ibss)
|
2009-04-19 21:24:32 +02:00
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_lock(wdev);
|
|
|
|
err = 0;
|
|
|
|
if (wdev->ssid_len)
|
2009-08-07 17:22:35 +02:00
|
|
|
err = __cfg80211_leave_ibss(rdev, dev, true);
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_unlock(wdev);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
return err;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
/* iwconfig uses nul termination in SSID.. */
|
|
|
|
if (len > 0 && ssid[len - 1] == '\0')
|
|
|
|
len--;
|
|
|
|
|
2009-05-09 20:09:03 +02:00
|
|
|
wdev->wext.ibss.ssid = wdev->ssid;
|
|
|
|
memcpy(wdev->wext.ibss.ssid, ssid, len);
|
|
|
|
wdev->wext.ibss.ssid_len = len;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_lock(&rdev->devlist_mtx);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
wdev_lock(wdev);
|
2009-08-07 17:22:35 +02:00
|
|
|
err = cfg80211_ibss_wext_join(rdev, wdev);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
wdev_unlock(wdev);
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_unlock(&rdev->devlist_mtx);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
|
|
|
|
return err;
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int cfg80211_ibss_wext_giwessid(struct net_device *dev,
|
|
|
|
struct iw_request_info *info,
|
|
|
|
struct iw_point *data, char *ssid)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
|
|
|
|
/* call only for ibss! */
|
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
data->flags = 0;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_lock(wdev);
|
2009-04-19 21:24:32 +02:00
|
|
|
if (wdev->ssid_len) {
|
|
|
|
data->flags = 1;
|
|
|
|
data->length = wdev->ssid_len;
|
|
|
|
memcpy(ssid, wdev->ssid, data->length);
|
2009-05-09 20:09:03 +02:00
|
|
|
} else if (wdev->wext.ibss.ssid && wdev->wext.ibss.ssid_len) {
|
2009-04-19 21:24:32 +02:00
|
|
|
data->flags = 1;
|
2009-05-09 20:09:03 +02:00
|
|
|
data->length = wdev->wext.ibss.ssid_len;
|
|
|
|
memcpy(ssid, wdev->wext.ibss.ssid, data->length);
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_unlock(wdev);
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cfg80211_ibss_wext_siwap(struct net_device *dev,
|
|
|
|
struct iw_request_info *info,
|
|
|
|
struct sockaddr *ap_addr, char *extra)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
2009-08-07 17:22:35 +02:00
|
|
|
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
|
2009-04-19 21:24:32 +02:00
|
|
|
u8 *bssid = ap_addr->sa_data;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* call only for ibss! */
|
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
if (!rdev->ops->join_ibss)
|
2009-04-19 21:24:32 +02:00
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
|
|
if (ap_addr->sa_family != ARPHRD_ETHER)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* automatic mode */
|
|
|
|
if (is_zero_ether_addr(bssid) || is_broadcast_ether_addr(bssid))
|
|
|
|
bssid = NULL;
|
|
|
|
|
|
|
|
/* both automatic */
|
2009-05-09 20:09:03 +02:00
|
|
|
if (!bssid && !wdev->wext.ibss.bssid)
|
2009-04-19 21:24:32 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* fixed already - and no change */
|
2009-05-09 20:09:03 +02:00
|
|
|
if (wdev->wext.ibss.bssid && bssid &&
|
|
|
|
compare_ether_addr(bssid, wdev->wext.ibss.bssid) == 0)
|
2009-04-19 21:24:32 +02:00
|
|
|
return 0;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_lock(wdev);
|
|
|
|
err = 0;
|
|
|
|
if (wdev->ssid_len)
|
2009-08-07 17:22:35 +02:00
|
|
|
err = __cfg80211_leave_ibss(rdev, dev, true);
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_unlock(wdev);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
return err;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
|
|
|
if (bssid) {
|
2009-05-09 20:09:03 +02:00
|
|
|
memcpy(wdev->wext.bssid, bssid, ETH_ALEN);
|
|
|
|
wdev->wext.ibss.bssid = wdev->wext.bssid;
|
2009-04-19 21:24:32 +02:00
|
|
|
} else
|
2009-05-09 20:09:03 +02:00
|
|
|
wdev->wext.ibss.bssid = NULL;
|
2009-04-19 21:24:32 +02:00
|
|
|
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_lock(&rdev->devlist_mtx);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
wdev_lock(wdev);
|
2009-08-07 17:22:35 +02:00
|
|
|
err = cfg80211_ibss_wext_join(rdev, wdev);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
wdev_unlock(wdev);
|
2009-08-07 17:22:35 +02:00
|
|
|
mutex_unlock(&rdev->devlist_mtx);
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
|
|
|
|
return err;
|
2009-04-19 21:24:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int cfg80211_ibss_wext_giwap(struct net_device *dev,
|
|
|
|
struct iw_request_info *info,
|
|
|
|
struct sockaddr *ap_addr, char *extra)
|
|
|
|
{
|
|
|
|
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
|
|
|
|
|
|
|
/* call only for ibss! */
|
|
|
|
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
ap_addr->sa_family = ARPHRD_ETHER;
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_lock(wdev);
|
2009-07-01 21:26:48 +02:00
|
|
|
if (wdev->current_bss)
|
2009-07-02 17:20:43 +02:00
|
|
|
memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN);
|
2009-07-09 10:59:49 +02:00
|
|
|
else if (wdev->wext.ibss.bssid)
|
2009-05-09 20:09:03 +02:00
|
|
|
memcpy(ap_addr->sa_data, wdev->wext.ibss.bssid, ETH_ALEN);
|
2009-07-09 10:59:49 +02:00
|
|
|
else
|
|
|
|
memset(ap_addr->sa_data, 0, ETH_ALEN);
|
|
|
|
|
2009-07-07 03:56:11 +02:00
|
|
|
wdev_unlock(wdev);
|
|
|
|
|
2009-04-19 21:24:32 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|