Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 268479
b: refs/heads/master
c: c57d250
h: refs/heads/master
i:
  268477: 855f74f
  268475: 1731dcc
  268471: 3a5894f
  268463: fffa537
  268447: 9e52654
  268415: c7ca31d
v: v3
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent 022e2bf commit 7b4f898
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 40 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66af0d7e80fb55c6811ee289e777c8a8d69ce494
refs/heads/master: c57d25025ddbcd41eb37044f82446dbda538e23b
10 changes: 5 additions & 5 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,20 +462,20 @@ struct brcmf_scan_results {
};

/* used for association with a specific BSSID and chanspec list */
struct brcmf_assoc_params {
struct brcmf_assoc_params_le {
/* 00:00:00:00:00:00: broadcast scan */
u8 bssid[ETH_ALEN];
/* 0: all available channels, otherwise count of chanspecs in
* chanspec_list */
s32 chanspec_num;
__le32 chanspec_num;
/* list of chanspecs */
u16 chanspec_list[1];
__le16 chanspec_list[1];
};

/* used for join with or without a specific bssid and channel list */
struct brcmf_join_params {
struct brcmf_ssid ssid;
struct brcmf_assoc_params params;
struct brcmf_ssid_le ssid_le;
struct brcmf_assoc_params_le params_le;
};

/* size of brcmf_scan_results not including variable length array */
Expand Down
63 changes: 29 additions & 34 deletions trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "wl_cfg80211.h"

#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
(sizeof(struct brcmf_assoc_params) - sizeof(u16))
(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))

static const u8 ether_bcast[ETH_ALEN] = {255, 255, 255, 255, 255, 255};

Expand Down Expand Up @@ -777,10 +777,7 @@ static void brcmf_ch_to_chanspec(int ch, struct brcmf_join_params *join_params,
u16 chanspec = 0;

if (ch != 0) {
join_params->params.chanspec_num = 1;
join_params->params.chanspec_list[0] = ch;

if (join_params->params.chanspec_list[0] <= CH_MAX_2G_CHANNEL)
if (ch <= CH_MAX_2G_CHANNEL)
chanspec |= WL_CHANSPEC_BAND_2G;
else
chanspec |= WL_CHANSPEC_BAND_5G;
Expand All @@ -789,19 +786,15 @@ static void brcmf_ch_to_chanspec(int ch, struct brcmf_join_params *join_params,
chanspec |= WL_CHANSPEC_CTL_SB_NONE;

*join_params_size += BRCMF_ASSOC_PARAMS_FIXED_SIZE +
join_params->params.chanspec_num * sizeof(u16);

join_params->params.chanspec_list[0] &= WL_CHANSPEC_CHAN_MASK;
join_params->params.chanspec_list[0] |= chanspec;
join_params->params.chanspec_list[0] =
cpu_to_le16(join_params->params.chanspec_list[0]);
sizeof(u16);

join_params->params.chanspec_num =
cpu_to_le32(join_params->params.chanspec_num);
chanspec |= (ch & WL_CHANSPEC_CHAN_MASK);
join_params->params_le.chanspec_list[0] = cpu_to_le16(chanspec);
join_params->params_le.chanspec_num = cpu_to_le32(1);

WL_CONN("join_params->params.chanspec_list[0]= %#X,"
"channel %d, chanspec %#X\n",
join_params->params.chanspec_list[0], ch, chanspec);
chanspec, ch, chanspec);
}
}

Expand Down Expand Up @@ -833,6 +826,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
s32 err = 0;
s32 wsec = 0;
s32 bcnprd;
struct brcmf_ssid ssid;

WL_TRACE("Enter\n");
if (!check_sys_up(wiphy))
Expand Down Expand Up @@ -910,24 +904,24 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
memset(&join_params, 0, sizeof(struct brcmf_join_params));

/* SSID */
join_params.ssid.SSID_len =
(params->ssid_len > 32) ? 32 : params->ssid_len;
memcpy(join_params.ssid.SSID, params->ssid, join_params.ssid.SSID_len);
join_params.ssid.SSID_len = cpu_to_le32(join_params.ssid.SSID_len);
join_params_size = sizeof(join_params.ssid);
brcmf_update_prof(cfg_priv, NULL, &join_params.ssid, WL_PROF_SSID);
ssid.SSID_len = min_t(u32, params->ssid_len, 32);
memcpy(ssid.SSID, params->ssid, ssid.SSID_len);
memcpy(join_params.ssid_le.SSID, params->ssid, ssid.SSID_len);
join_params.ssid_le.SSID_len = cpu_to_le32(ssid.SSID_len);
join_params_size = sizeof(join_params.ssid_le);
brcmf_update_prof(cfg_priv, NULL, &ssid, WL_PROF_SSID);

/* BSSID */
if (params->bssid) {
memcpy(join_params.params.bssid, params->bssid, ETH_ALEN);
join_params_size = sizeof(join_params.ssid) +
BRCMF_ASSOC_PARAMS_FIXED_SIZE;
memcpy(join_params.params_le.bssid, params->bssid, ETH_ALEN);
join_params_size = sizeof(join_params.ssid_le) +
BRCMF_ASSOC_PARAMS_FIXED_SIZE;
} else {
memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN);
memcpy(join_params.params_le.bssid, ether_bcast, ETH_ALEN);
}

brcmf_update_prof(cfg_priv, NULL,
&join_params.params.bssid, WL_PROF_BSSID);
&join_params.params_le.bssid, WL_PROF_BSSID);

/* Channel */
if (params->channel) {
Expand Down Expand Up @@ -1244,6 +1238,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
struct ieee80211_channel *chan = sme->channel;
struct brcmf_join_params join_params;
size_t join_params_size;
struct brcmf_ssid ssid;

s32 err = 0;

Expand Down Expand Up @@ -1299,19 +1294,19 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
}

memset(&join_params, 0, sizeof(join_params));
join_params_size = sizeof(join_params.ssid);
join_params_size = sizeof(join_params.ssid_le);

join_params.ssid.SSID_len =
min(sizeof(join_params.ssid.SSID), sme->ssid_len);
memcpy(&join_params.ssid.SSID, sme->ssid, join_params.ssid.SSID_len);
join_params.ssid.SSID_len = cpu_to_le32(join_params.ssid.SSID_len);
brcmf_update_prof(cfg_priv, NULL, &join_params.ssid, WL_PROF_SSID);
ssid.SSID_len = min_t(u32, sizeof(ssid.SSID), sme->ssid_len);
memcpy(&join_params.ssid_le.SSID, sme->ssid, ssid.SSID_len);
memcpy(&ssid.SSID, sme->ssid, ssid.SSID_len);
join_params.ssid_le.SSID_len = cpu_to_le32(ssid.SSID_len);
brcmf_update_prof(cfg_priv, NULL, &ssid, WL_PROF_SSID);

memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN);
memcpy(join_params.params_le.bssid, ether_bcast, ETH_ALEN);

if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN)
if (ssid.SSID_len < IEEE80211_MAX_SSID_LEN)
WL_CONN("ssid \"%s\", len (%d)\n",
join_params.ssid.SSID, join_params.ssid.SSID_len);
ssid.SSID, ssid.SSID_len);

brcmf_ch_to_chanspec(cfg_priv->channel,
&join_params, &join_params_size);
Expand Down

0 comments on commit 7b4f898

Please sign in to comment.