Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 (70180659) · Commits · e / devices / android_kernel_teracube_2e

net/mac80211/ieee80211_sta.c

+9 −46

Original line number	Original line	Diff line number	Diff line
	@@ -108,14 +108,11 @@ struct ieee802_11_elems {
	u8 wmm_param_len;		u8 wmm_param_len;
	};		};

	enum ParseRes { ParseOK = 0, ParseUnknown = 1, ParseFailed = -1 };		static void ieee802_11_parse_elems(u8 *start, size_t len,

	static enum ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
	struct ieee802_11_elems *elems)		struct ieee802_11_elems *elems)
	{		{
	size_t left = len;		size_t left = len;
	u8 *pos = start;		u8 *pos = start;
	int unknown = 0;

	memset(elems, 0, sizeof(*elems));		memset(elems, 0, sizeof(*elems));

	@@ -126,15 +123,8 @@ static enum ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
	elen = *pos++;		elen = *pos++;
	left -= 2;		left -= 2;

	if (elen > left) {		if (elen > left)
	#if 0		return;
	if (net_ratelimit())
	printk(KERN_DEBUG "IEEE 802.11 element parse "
	"failed (id=%d elen=%d left=%d)\n",
	id, elen, left);
	#endif
	return ParseFailed;
	}

	switch (id) {		switch (id) {
	case WLAN_EID_SSID:		case WLAN_EID_SSID:
	@@ -201,28 +191,15 @@ static enum ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
	elems->ext_supp_rates_len = elen;		elems->ext_supp_rates_len = elen;
	break;		break;
	default:		default:
	#if 0
	printk(KERN_DEBUG "IEEE 802.11 element parse ignored "
	"unknown element (id=%d elen=%d)\n",
	id, elen);
	#endif
	unknown++;
	break;		break;
	}		}

	left -= elen;		left -= elen;
	pos += elen;		pos += elen;
	}		}

	/* Do not trigger error if left == 1 as Apple Airport base stations
	* send AssocResps that are one spurious byte too long. */

	return unknown ? ParseUnknown : ParseOK;
	}		}




	static int ecw2cw(int ecw)		static int ecw2cw(int ecw)
	{		{
	int cw = 1;		int cw = 1;
	@@ -931,12 +908,7 @@ static void ieee80211_auth_challenge(struct net_device *dev,

	printk(KERN_DEBUG "%s: replying to auth challenge\n", dev->name);		printk(KERN_DEBUG "%s: replying to auth challenge\n", dev->name);
	pos = mgmt->u.auth.variable;		pos = mgmt->u.auth.variable;
	if (ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems)		ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
	== ParseFailed) {
	printk(KERN_DEBUG "%s: failed to parse Auth(challenge)\n",
	dev->name);
	return;
	}
	if (!elems.challenge) {		if (!elems.challenge) {
	printk(KERN_DEBUG "%s: no challenge IE in shared key auth "		printk(KERN_DEBUG "%s: no challenge IE in shared key auth "
	"frame\n", dev->name);		"frame\n", dev->name);
	@@ -1230,12 +1202,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
	aid &= ~(BIT(15) \| BIT(14));		aid &= ~(BIT(15) \| BIT(14));

	pos = mgmt->u.assoc_resp.variable;		pos = mgmt->u.assoc_resp.variable;
	if (ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems)		ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
	== ParseFailed) {
	printk(KERN_DEBUG "%s: failed to parse AssocResp\n",
	dev->name);
	return;
	}

	if (!elems.supp_rates) {		if (!elems.supp_rates) {
	printk(KERN_DEBUG "%s: no SuppRates element in AssocResp\n",		printk(KERN_DEBUG "%s: no SuppRates element in AssocResp\n",
	@@ -1459,7 +1426,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);		struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
	struct ieee802_11_elems elems;		struct ieee802_11_elems elems;
	size_t baselen;		size_t baselen;
	int channel, invalid = 0, clen;		int channel, clen;
	struct ieee80211_sta_bss *bss;		struct ieee80211_sta_bss *bss;
	struct sta_info *sta;		struct sta_info *sta;
	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);		struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
	@@ -1505,9 +1472,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
	#endif /* CONFIG_MAC80211_IBSS_DEBUG */		#endif /* CONFIG_MAC80211_IBSS_DEBUG */
	}		}

	if (ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen,		ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems);
	&elems) == ParseFailed)
	invalid = 1;

	if (sdata->type == IEEE80211_IF_TYPE_IBSS && elems.supp_rates &&		if (sdata->type == IEEE80211_IF_TYPE_IBSS && elems.supp_rates &&
	memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0 &&		memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0 &&
	@@ -1724,9 +1689,7 @@ static void ieee80211_rx_mgmt_beacon(struct net_device *dev,
	if (baselen > len)		if (baselen > len)
	return;		return;

	if (ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen,		ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems);
	&elems) == ParseFailed)
	return;

	if (elems.erp_info && elems.erp_info_len >= 1)		if (elems.erp_info && elems.erp_info_len >= 1)
	ieee80211_handle_erp_ie(dev, elems.erp_info[0]);		ieee80211_handle_erp_ie(dev, elems.erp_info[0]);