From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 2 Dec 2013 18:22:17 +0000 (+0100)
Subject: mac80211: move align variable to remove __maybe_unused
X-Git-Tag: upstream/snapshot3+hdmi~3572^2~3^2^2~220
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e01362265487f05b69233aab4426ab6166f7b1ec;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

mac80211: move align variable to remove __maybe_unused

There's no reason for the variable to not be inside
the #ifdef, move it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 30ac609..5cf7285 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1963,8 +1963,6 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 	}
 
 	if (skb) {
-		int align __maybe_unused;
-
 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
 		/*
 		 * 'align' will only take the values 0 or 2 here
@@ -1975,7 +1973,8 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 		 * access fields as 2-byte aligned (e.g. for
 		 * compare_ether_addr)
 		 */
-		align = ((unsigned long)(skb->data + sizeof(struct ethhdr))) & 3;
+		int align = ((unsigned long)(skb->data +
+					     sizeof(struct ethhdr))) & 3;
 		if (align) {
 			if (WARN_ON(skb_headroom(skb) < 3)) {
 				dev_kfree_skb(skb);