aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/scan.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2009-10-22 09:30:46 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:36 -0400
commitf4228b4c2e5864ee9d2051176beb2bd5a49a15cc (patch)
tree2b71315c12ab84c145fa75283f7e79a39d170c98 /drivers/net/wireless/libertas/scan.c
parentd37b4fdd43f7e5686c40181f33a50a7ee03ddbd8 (diff)
libertas: remove unused 11d.h as well, priv->countryinfo
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
-rw-r--r--drivers/net/wireless/libertas/scan.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 584ff76bcf82..64b404783f44 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -503,7 +503,6 @@ static int lbs_process_bss(struct bss_descriptor *bss,
503 struct ieee_ie_cf_param_set *cf; 503 struct ieee_ie_cf_param_set *cf;
504 struct ieee_ie_ibss_param_set *ibss; 504 struct ieee_ie_ibss_param_set *ibss;
505 DECLARE_SSID_BUF(ssid); 505 DECLARE_SSID_BUF(ssid);
506 struct ieee_ie_country_info_set *pcountryinfo;
507 uint8_t *pos, *end, *p; 506 uint8_t *pos, *end, *p;
508 uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0; 507 uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
509 uint16_t beaconsize = 0; 508 uint16_t beaconsize = 0;
@@ -626,26 +625,6 @@ static int lbs_process_bss(struct bss_descriptor *bss,
626 lbs_deb_scan("got IBSS IE\n"); 625 lbs_deb_scan("got IBSS IE\n");
627 break; 626 break;
628 627
629 case WLAN_EID_COUNTRY:
630 pcountryinfo = (struct ieee_ie_country_info_set *) pos;
631 lbs_deb_scan("got COUNTRY IE\n");
632 if (pcountryinfo->header.len < sizeof(pcountryinfo->countrycode)
633 || pcountryinfo->header.len > 254) {
634 lbs_deb_scan("%s: 11D- Err CountryInfo len %d, min %zd, max 254\n",
635 __func__,
636 pcountryinfo->header.len,
637 sizeof(pcountryinfo->countrycode));
638 ret = -1;
639 goto done;
640 }
641
642 memcpy(&bss->countryinfo, pcountryinfo,
643 pcountryinfo->header.len + 2);
644 lbs_deb_hex(LBS_DEB_SCAN, "process_bss: 11d countryinfo",
645 (uint8_t *) pcountryinfo,
646 (int) (pcountryinfo->header.len + 2));
647 break;
648
649 case WLAN_EID_EXT_SUPP_RATES: 628 case WLAN_EID_EXT_SUPP_RATES:
650 /* only process extended supported rate if data rate is 629 /* only process extended supported rate if data rate is
651 * already found. Data rate IE should come before 630 * already found. Data rate IE should come before