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

net/mac80211/work.c

+25 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#define IEEE80211_MAX_PROBE_TRIES 5

		enum work_action {
		WORK_ACT_MISMATCH,
		WORK_ACT_NONE,
		WORK_ACT_TIMEOUT,
		WORK_ACT_DONE,
		@@ -584,7 +585,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_work *wk,
		u16 auth_alg, auth_transaction, status_code;

		if (wk->type != IEEE80211_WORK_AUTH)
		return WORK_ACT_NONE;
		return WORK_ACT_MISMATCH;

		if (len < 24 + 6)
		return WORK_ACT_NONE;
		@@ -635,6 +636,9 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_work *wk,
		struct ieee802_11_elems elems;
		u8 *pos;

		if (wk->type != IEEE80211_WORK_ASSOC)
		return WORK_ACT_MISMATCH;

		/*
		* AssocResp and ReassocResp have identical structure, so process both
		* of them in this function.
		@@ -690,6 +694,12 @@ ieee80211_rx_mgmt_probe_resp(struct ieee80211_work *wk,

		ASSERT_WORK_MTX(local);

		if (wk->type != IEEE80211_WORK_DIRECT_PROBE)
		return WORK_ACT_MISMATCH;

		if (len < 24 + 12)
		return WORK_ACT_NONE;

		baselen = (u8 ) mgmt->u.probe_resp.variable - (u8 ) mgmt;
		if (baselen > len)
		return WORK_ACT_NONE;
		@@ -704,7 +714,7 @@ static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local,
		struct ieee80211_rx_status *rx_status;
		struct ieee80211_mgmt *mgmt;
		struct ieee80211_work *wk;
		enum work_action rma = WORK_ACT_NONE;
		enum work_action rma;
		u16 fc;

		rx_status = (struct ieee80211_rx_status *) skb->cb;
		@@ -751,7 +761,17 @@ static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local,
		break;
		default:
		WARN_ON(1);
		rma = WORK_ACT_NONE;
		}

		/*
		* We've either received an unexpected frame, or we have
		* multiple work items and need to match the frame to the
		* right one.
		*/
		if (rma == WORK_ACT_MISMATCH)
		continue;

		/*
		* We've processed this frame for that work, so it can't
		* belong to another work struct.
		@@ -761,6 +781,9 @@ static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local,
		}

		switch (rma) {
		case WORK_ACT_MISMATCH:
		/* ignore this unmatched frame */
		break;
		case WORK_ACT_NONE:
		break;
		case WORK_ACT_DONE: