X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;h=e5036407cf89278c47970e82df3b4fe2dc07e3b9;hb=12d3f1ba6ba522cd1ef11483d813fe2c2e64f04b;hp=9eb336a267eee7c4858d1e057e18358cede4b7c8;hpb=6476369c2c6d4ba487408cb5daff8df0480d6b4a;p=carl9170fw.git diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c index 9eb336a..e503640 100644 --- a/carlfw/src/wlan.c +++ b/carlfw/src/wlan.c @@ -6,7 +6,7 @@ * Copyright (c) 2000-2005 ZyDAS Technology Corporation * Copyright (c) 2007-2009 Atheros Communications, Inc. * Copyright 2009 Johannes Berg - * Copyright 2009, 2010 Christian Lamparter + * Copyright 2009-2011 Christian Lamparter * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -296,11 +296,24 @@ static void __wlan_tx(struct dma_desc *desc) #endif /* CONFIG_CARL9170FW_LOOPBACK */ } +static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif) +{ + hdr->seq_ctrl &= cpu_to_le16(~IEEE80211_SCTL_SEQ); + hdr->seq_ctrl |= cpu_to_le16(fw.wlan.sequence[vif]); + + if (!(hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG))) + fw.wlan.sequence[vif] += 0x10; +} + /* prepares frame for the first transmission */ static void _wlan_tx(struct dma_desc *desc) { struct carl9170_tx_superframe *super = get_super(desc); + if (unlikely(super->s.assign_seq)) { + wlan_assign_seq(&super->f.data.i3e, super->s.vif_id); + } + if (unlikely(super->s.ampdu_commit_density)) { set(AR9170_MAC_REG_AMPDU_DENSITY, MOD_VAL(AR9170_MAC_AMPDU_DENSITY, @@ -631,7 +644,9 @@ static void wlan_check_rx_overrun(void) } #ifdef CONFIG_CARL9170FW_WOL -static void wlan_rx_wol(struct ieee80211_hdr *hdr, unsigned int len) + +#ifdef CONFIG_CARL9170FW_WOL_MAGIC_PACKET +static bool wlan_rx_wol_magic_packet(struct ieee80211_hdr *hdr, unsigned int len) { const unsigned char *data, *end, *mac; unsigned int found = 0; @@ -696,14 +711,81 @@ static void wlan_rx_wol(struct ieee80211_hdr *hdr, unsigned int len) } if (found == (6 + 16 * 6)) { - fw.suspend_mode = CARL9170_AWAKE_HOST; - return; + return true; } data++; } - return; + return false; +} +#endif /* CONFIG_CARL9170FW_WOL_MAGIC_PACKET */ + +#ifdef CONFIG_CARL9170FW_WOL_PROBE_REQUEST + +/* + * Note: CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID is not a real + * string. We have to be careful not to add a \0 at the end. + */ +static const struct { + u8 ssid_ie; + u8 ssid_len; + u8 ssid[sizeof(CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID) - 1]; +} __packed probe_req = { + .ssid_ie = WLAN_EID_SSID, + .ssid_len = sizeof(CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID) - 1, + .ssid = CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID, +}; + +static bool wlan_rx_wol_probe_ssid(struct ieee80211_hdr *hdr, unsigned int len) +{ + const unsigned char *data, *end, *scan = (void *) &probe_req; + + /* + * IEEE 802.11-2007 7.3.2.1 specifies that the SSID is no + * longer than 32 octets. + */ + BUILD_BUG_ON((sizeof(CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID) - 1) > 32); + + if (ieee80211_is_probe_req(hdr->frame_control)) { + unsigned int i; + end = (u8 *)((unsigned long)hdr + len); + + /* + * The position of the SSID information element inside + * a probe request frame is more or less "fixed". + */ + data = (u8 *)((struct ieee80211_mgmt *)hdr)->u.probe_req.variable; + for (i = 0; i < (unsigned int)(probe_req.ssid_len + 1); i++) { + if (scan[i] != data[i]) + return false; + } + + return true; + } + + return false; +} +#endif /* CONFIG_CARL9170FW_WOL_PROBE_REQUEST */ + +static void wlan_rx_wol(unsigned int rx_filter __unused, struct ieee80211_hdr *hdr __unused, unsigned int len __unused) +{ + bool __unused wake_up = false; + +#ifdef CONFIG_CARL9170FW_WOL_MAGIC_PACKET + if (rx_filter & CARL9170_RX_FILTER_DATA) + wake_up |= wlan_rx_wol_magic_packet(hdr, len); +#endif /* CONFIG_CARL9170FW_WOL_MAGIC_PACKET */ + +#ifdef CONFIG_CARL9170FW_WOL_PROBE_REQUEST + if (rx_filter & CARL9170_RX_FILTER_MGMT) + wake_up |= wlan_rx_wol_probe_ssid(hdr, len); +#endif /* CONFIG_CARL9170FW_WOL_PROBE_REQUEST */ + + if (wake_up) { + fw.suspend_mode = CARL9170_AWAKE_HOST; + set(AR9170_USB_REG_WAKE_UP, AR9170_USB_WAKE_UP_WAKE); + } } #endif /* CONFIG_CARL9170FW_WOL */ @@ -763,9 +845,8 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc) #ifdef CONFIG_CARL9170FW_WOL if (unlikely(fw.suspend_mode == CARL9170_HOST_SUSPENDED)) { - if (rx_filter & CARL9170_RX_FILTER_DATA) - wlan_rx_wol(hdr, min(data_len, - (unsigned int)AR9170_BLOCK_SIZE)); + wlan_rx_wol(rx_filter, hdr, min(data_len, + (unsigned int)AR9170_BLOCK_SIZE)); } #endif /* CONFIG_CARL9170FW_WOL */ @@ -842,7 +923,7 @@ static uint8_t *beacon_find_ie(uint8_t ie, void *addr, return NULL; } -void wlan_cab_modify_dtim_beacon(const unsigned int vif, +void wlan_modify_beacon(const unsigned int vif, const unsigned int addr, const unsigned int len) { uint8_t *_ie; @@ -867,6 +948,15 @@ void wlan_cab_modify_dtim_beacon(const unsigned int vif, ie->bitmap_ctrl |= 0x1; } } + + /* + * Ideally, the sequence number should be assigned by the TX arbiter + * hardware. But AFAIK that's not possible, so we have to go for the + * next best thing and write it into the beacon fifo during the open + * beacon update window. + */ + + wlan_assign_seq((struct ieee80211_hdr *)addr, vif); } #endif /* CONFIG_CARL9170FW_CAB_QUEUE */ @@ -877,8 +967,6 @@ static void handle_beacon_config(void) bcn_count = get(AR9170_MAC_REG_BCN_COUNT); send_cmd_to_host(4, CARL9170_RSP_BEACON_CONFIG, 0x00, (uint8_t *) &bcn_count); - - set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY); } static void handle_pretbtt(void)