aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/assoc.c
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2009-05-22 20:03:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-06-03 14:05:09 -0400
commit75b6a61a47353fd404277ae3f2dda03af96a8c1a (patch)
tree83cbebe5ec669f8c6386dcd3dec7bd0e50487e9a /drivers/net/wireless/libertas/assoc.c
parent5fd164e96cb9dc111f75468378de38c67b0fd161 (diff)
libertas: restyle Marvell & IEEE TLV structure names
Easier to read and more conformant with kernel style. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
-rw-r--r--drivers/net/wireless/libertas/assoc.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index d4d1d80045e0..75c67c9d1178 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -342,13 +342,13 @@ static int lbs_adhoc_start(struct lbs_private *priv,
342 WARN_ON(!assoc_req->channel); 342 WARN_ON(!assoc_req->channel);
343 343
344 /* set Physical parameter set */ 344 /* set Physical parameter set */
345 cmd.ds.elementid = WLAN_EID_DS_PARAMS; 345 cmd.ds.header.id = WLAN_EID_DS_PARAMS;
346 cmd.ds.len = 1; 346 cmd.ds.header.len = 1;
347 cmd.ds.channel = assoc_req->channel; 347 cmd.ds.channel = assoc_req->channel;
348 348
349 /* set IBSS parameter set */ 349 /* set IBSS parameter set */
350 cmd.ibss.elementid = WLAN_EID_IBSS_PARAMS; 350 cmd.ibss.header.id = WLAN_EID_IBSS_PARAMS;
351 cmd.ibss.len = 2; 351 cmd.ibss.header.len = 2;
352 cmd.ibss.atimwindow = cpu_to_le16(0); 352 cmd.ibss.atimwindow = cpu_to_le16(0);
353 353
354 /* set capability info */ 354 /* set capability info */
@@ -1558,11 +1558,11 @@ int lbs_cmd_80211_associate(struct lbs_private *priv,
1558 struct bss_descriptor *bss = &assoc_req->bss; 1558 struct bss_descriptor *bss = &assoc_req->bss;
1559 u8 *pos; 1559 u8 *pos;
1560 u16 tmpcap, tmplen; 1560 u16 tmpcap, tmplen;
1561 struct mrvlietypes_ssidparamset *ssid; 1561 struct mrvl_ie_ssid_param_set *ssid;
1562 struct mrvlietypes_dsparamset *ds; 1562 struct mrvl_ie_ds_param_set *ds;
1563 struct mrvlietypes_cfparamset *cf; 1563 struct mrvl_ie_cf_param_set *cf;
1564 struct mrvlietypes_ratesparamset *rates; 1564 struct mrvl_ie_rates_param_set *rates;
1565 struct mrvlietypes_rsnparamset *rsn; 1565 struct mrvl_ie_rsn_param_set *rsn;
1566 1566
1567 lbs_deb_enter(LBS_DEB_ASSOC); 1567 lbs_deb_enter(LBS_DEB_ASSOC);
1568 1568
@@ -1586,27 +1586,27 @@ int lbs_cmd_80211_associate(struct lbs_private *priv,
1586 pos += sizeof(passo->bcnperiod); 1586 pos += sizeof(passo->bcnperiod);
1587 pos += sizeof(passo->dtimperiod); 1587 pos += sizeof(passo->dtimperiod);
1588 1588
1589 ssid = (struct mrvlietypes_ssidparamset *) pos; 1589 ssid = (struct mrvl_ie_ssid_param_set *) pos;
1590 ssid->header.type = cpu_to_le16(TLV_TYPE_SSID); 1590 ssid->header.type = cpu_to_le16(TLV_TYPE_SSID);
1591 tmplen = bss->ssid_len; 1591 tmplen = bss->ssid_len;
1592 ssid->header.len = cpu_to_le16(tmplen); 1592 ssid->header.len = cpu_to_le16(tmplen);
1593 memcpy(ssid->ssid, bss->ssid, tmplen); 1593 memcpy(ssid->ssid, bss->ssid, tmplen);
1594 pos += sizeof(ssid->header) + tmplen; 1594 pos += sizeof(ssid->header) + tmplen;
1595 1595
1596 ds = (struct mrvlietypes_dsparamset *) pos; 1596 ds = (struct mrvl_ie_ds_param_set *) pos;
1597 ds->header.type = cpu_to_le16(TLV_TYPE_PHY_DS); 1597 ds->header.type = cpu_to_le16(TLV_TYPE_PHY_DS);
1598 ds->header.len = cpu_to_le16(1); 1598 ds->header.len = cpu_to_le16(1);
1599 ds->channel = bss->phy.ds.channel; 1599 ds->channel = bss->phy.ds.channel;
1600 pos += sizeof(ds->header) + 1; 1600 pos += sizeof(ds->header) + 1;
1601 1601
1602 cf = (struct mrvlietypes_cfparamset *) pos; 1602 cf = (struct mrvl_ie_cf_param_set *) pos;
1603 cf->header.type = cpu_to_le16(TLV_TYPE_CF); 1603 cf->header.type = cpu_to_le16(TLV_TYPE_CF);
1604 tmplen = sizeof(*cf) - sizeof (cf->header); 1604 tmplen = sizeof(*cf) - sizeof (cf->header);
1605 cf->header.len = cpu_to_le16(tmplen); 1605 cf->header.len = cpu_to_le16(tmplen);
1606 /* IE payload should be zeroed, firmware fills it in for us */ 1606 /* IE payload should be zeroed, firmware fills it in for us */
1607 pos += sizeof(*cf); 1607 pos += sizeof(*cf);
1608 1608
1609 rates = (struct mrvlietypes_ratesparamset *) pos; 1609 rates = (struct mrvl_ie_rates_param_set *) pos;
1610 rates->header.type = cpu_to_le16(TLV_TYPE_RATES); 1610 rates->header.type = cpu_to_le16(TLV_TYPE_RATES);
1611 memcpy(&rates->rates, &bss->rates, MAX_RATES); 1611 memcpy(&rates->rates, &bss->rates, MAX_RATES);
1612 tmplen = MAX_RATES; 1612 tmplen = MAX_RATES;
@@ -1628,7 +1628,7 @@ int lbs_cmd_80211_associate(struct lbs_private *priv,
1628 lbs_set_basic_rate_flags(rates->rates, tmplen); 1628 lbs_set_basic_rate_flags(rates->rates, tmplen);
1629 1629
1630 if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) { 1630 if (assoc_req->secinfo.WPAenabled || assoc_req->secinfo.WPA2enabled) {
1631 rsn = (struct mrvlietypes_rsnparamset *) pos; 1631 rsn = (struct mrvl_ie_rsn_param_set *) pos;
1632 /* WPA_IE or WPA2_IE */ 1632 /* WPA_IE or WPA2_IE */
1633 rsn->header.type = cpu_to_le16((u16) assoc_req->wpa_ie[0]); 1633 rsn->header.type = cpu_to_le16((u16) assoc_req->wpa_ie[0]);
1634 tmplen = (u16) assoc_req->wpa_ie[1]; 1634 tmplen = (u16) assoc_req->wpa_ie[1];