From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 7 Jan 2014 11:10:20 +0000 (+0200)
Subject: mac80211: simplify code in ieee80211_prepare_and_rx_handle
X-Git-Tag: v3.14-rc1~94^2~3^2^2~42^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40791942ec6befaad04073ed97adb8ab04ab43f3;p=platform%2Fkernel%2Flinux-stable.git

mac80211: simplify code in ieee80211_prepare_and_rx_handle

No need to assign the return value of prepare_for_handlers
to a variable if the only usage is to test it.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5a2afe9..8cb20d7 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3191,13 +3191,11 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
 	struct ieee80211_sub_if_data *sdata = rx->sdata;
 	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
 	struct ieee80211_hdr *hdr = (void *)skb->data;
-	int prepares;
 
 	rx->skb = skb;
 	status->rx_flags |= IEEE80211_RX_RA_MATCH;
-	prepares = prepare_for_handlers(rx, hdr);
 
-	if (!prepares)
+	if (!prepare_for_handlers(rx, hdr))
 		return false;
 
 	if (!consume) {