From 2a7df6e2442905f11a1229e729c21d2359050d5f Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 1 Jun 2011 13:44:49 +0200 Subject: [PATCH] --- yaml --- r: 259344 b: refs/heads/master c: 63d7c94c4bfbc28a9d860712cbdd33aa31db52b7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index ce90cbe07c7c..2f55bdaac024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fa341e5f57b8dda0d20e531b8767e767531ccea +refs/heads/master: 63d7c94c4bfbc28a9d860712cbdd33aa31db52b7 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h index 193f73a4fe7c..4d45972fdfbf 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.h @@ -208,19 +208,6 @@ struct wlc_protection { s8 nongf_override; /* override for use of GF protection */ s8 n_pam_override; /* override for preamble: MM or GF */ bool n_obss; /* indicated OBSS Non-HT STA present */ - - uint longpre_detect_timeout; /* #sec until long preamble bcns gone */ - uint barker_detect_timeout; /* #sec until bcns signaling Barker long preamble */ - /* only is gone */ - uint ofdm_ibss_timeout; /* #sec until ofdm IBSS beacons gone */ - uint ofdm_ovlp_timeout; /* #sec until ofdm overlapping BSS bcns gone */ - uint nonerp_ibss_timeout; /* #sec until nonerp IBSS beacons gone */ - uint nonerp_ovlp_timeout; /* #sec until nonerp overlapping BSS bcns gone */ - uint g_ibss_timeout; /* #sec until bcns signaling Use_Protection gone */ - uint n_ibss_timeout; /* #sec until bcns signaling Use_OFDM_Protection gone */ - uint ht20in40_ovlp_timeout; /* #sec until 20MHz overlapping OPMODE gone */ - uint ht20in40_ibss_timeout; /* #sec until 20MHz-only HT station bcns gone */ - uint non_gf_ibss_timeout; /* #sec until non-GF bcns gone */ }; /* anything affects the single/dual streams/antenna operation */