diff options
| author | Johannes Berg | 2013-12-02 19:22:17 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-12-03 13:23:45 +0100 |
| commit | e01362265487f05b69233aab4426ab6166f7b1ec (patch) | |
| tree | f968ba9d4fd1dbf8fc97ebc2b2d206a0187d88a9 /net/mac80211/rx.c | |
| parent | Revert "mac80211: add driver callback for per-interface multicast filter" (diff) | |
| download | kernel-qcow2-linux-e01362265487f05b69233aab4426ab6166f7b1ec.tar.gz kernel-qcow2-linux-e01362265487f05b69233aab4426ab6166f7b1ec.tar.xz kernel-qcow2-linux-e01362265487f05b69233aab4426ab6166f7b1ec.zip | |
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>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 30ac6099da06..5cf7285f6df9 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); |