openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rndis_wlan: split getting current channel to separate function 

Split getting current channel channel from hardware to separate function
as this function will be needed later in patch 'pass channel info to
cfg80211_roamed()'.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Jussi Kivilinna 2011-11-19 13:04:05 +02:00 committed by John W. Linville
parent ef96a84202
commit cb82a66d0f
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/net/wireless/rndis_wlan.c
View File

@ -1347,6 +1347,32 @@ static int set_channel(struct usbnet *usbdev, int channel)
return ret; return ret;
} }
static struct ieee80211_channel *get_current_channel(struct usbnet *usbdev,
u16 *beacon_interval)
{
struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
struct ieee80211_channel *channel;
struct ndis_80211_conf config;
int len, ret;
/* Get channel and beacon interval */
len = sizeof(config);
ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n",
__func__, ret);
if (ret < 0)
return NULL;
channel = ieee80211_get_channel(priv->wdev.wiphy,
KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));
if (!channel)
return NULL;
if (beacon_interval)
*beacon_interval = le16_to_cpu(config.beacon_period);
return channel;
}
/* index must be 0 - N, as per NDIS */ /* index must be 0 - N, as per NDIS */
static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len, static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,
int index) int index)
@ -2650,13 +2676,12 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
{ {
struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
struct ndis_80211_conf config;
struct ndis_80211_ssid ssid; struct ndis_80211_ssid ssid;
struct cfg80211_bss *bss; struct cfg80211_bss *bss;
s32 signal; s32 signal;
u64 timestamp; u64 timestamp;
u16 capability; u16 capability;
u16 beacon_interval; u16 beacon_interval = 0;
__le32 rssi; __le32 rssi;
u8 ie_buf[34]; u8 ie_buf[34];
int len, ret, ie_len; int len, ret, ie_len;
@ -2681,22 +2706,10 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
} }
/* Get channel and beacon interval */ /* Get channel and beacon interval */
len = sizeof(config); channel = get_current_channel(usbdev, &beacon_interval);
ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len); if (!channel) {
netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n", netdev_warn(usbdev->net, "%s(): could not get channel.\n",
__func__, ret); __func__);
if (ret >= 0) {
beacon_interval = le16_to_cpu(config.beacon_period);
channel = ieee80211_get_channel(priv->wdev.wiphy,
KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));
if (!channel) {
netdev_warn(usbdev->net, "%s(): could not get channel."
"\n", __func__);
return;
}
} else {
netdev_warn(usbdev->net, "%s(): could not get configuration.\n",
__func__);
return; return;
} }