diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-01 13:47:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-01 13:47:20 +1000 |
| commit | 73b955582ea5bcdb470d996685cd7f1abd3ce7f5 (patch) | |
| tree | dd2e408f5c2bd14551671cc902a8cdb892544ea3 /drivers/staging/rtl8188eu/core/rtw_ieee80211.c | |
| parent | 4ccbb5fb61794d14cca24cb8dcc68db025f7659a (diff) | |
| parent | ca9280d1f82a7a0165a683dc09f182329ebec352 (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Diffstat (limited to 'drivers/staging/rtl8188eu/core/rtw_ieee80211.c')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c index d1dafe0f20c6..bb867a987c2b 100644 --- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c @@ -955,50 +955,6 @@ void rtw_macaddr_cfg(u8 *mac_addr) DBG_88E("rtw_macaddr_cfg MAC Address = %pM\n", (mac_addr)); } -/* Baron adds to avoid FreeBSD warning */ -int ieee80211_is_empty_essid(const char *essid, int essid_len) -{ - /* Single white space is for Linksys APs */ - if (essid_len == 1 && essid[0] == ' ') - return 1; - - /* Otherwise, if the entire essid is 0, we assume it is hidden */ - while (essid_len) { - essid_len--; - if (essid[essid_len] != '\0') - return 0; - } - - return 1; -} - -int ieee80211_get_hdrlen(u16 fc) -{ - int hdrlen = 24; - - switch (WLAN_FC_GET_TYPE(fc)) { - case RTW_IEEE80211_FTYPE_DATA: - if (fc & RTW_IEEE80211_STYPE_QOS_DATA) - hdrlen += 2; - if ((fc & RTW_IEEE80211_FCTL_FROMDS) && (fc & RTW_IEEE80211_FCTL_TODS)) - hdrlen += 6; /* Addr4 */ - break; - case RTW_IEEE80211_FTYPE_CTL: - switch (WLAN_FC_GET_STYPE(fc)) { - case RTW_IEEE80211_STYPE_CTS: - case RTW_IEEE80211_STYPE_ACK: - hdrlen = 10; - break; - default: - hdrlen = 16; - break; - } - break; - } - - return hdrlen; -} - static int rtw_get_cipher_info(struct wlan_network *pnetwork) { uint wpa_ielen; |