mac80211: move align variable to remove __maybe_unused
authorJohannes Berg <johannes.berg@intel.com>
Mon, 2 Dec 2013 18:22:17 +0000 (19:22 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 3 Dec 2013 12:23:45 +0000 (13:23 +0100)
There's no reason for the variable to not be inside
the #ifdef, move it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/rx.c

index 30ac609..5cf7285 100644 (file)
@@ -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);