aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas_tf
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-06-30 13:34:06 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-06-30 13:34:06 -0400
commitdf2cbe40753dc36af294c30209ed909869aca6cf (patch)
tree39eb7e8e06737b295007126f4e16c1b688427163 /drivers/net/wireless/libertas_tf
parent1049f6413f6e52572a768ca1590fa479ef0a48e8 (diff)
parent9a4ba833a2d0016cf836827e136f0c219834bd41 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas_tf')
-rw-r--r--drivers/net/wireless/libertas_tf/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 5beb58142e9..acc461aa385 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -586,7 +586,7 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
need_padding ^= ieee80211_has_a4(hdr->frame_control);
need_padding ^= ieee80211_is_data_qos(hdr->frame_control) &&
(*ieee80211_get_qos_ctl(hdr) &
- IEEE80211_QOS_CONTROL_A_MSDU_PRESENT);
+ IEEE80211_QOS_CTL_A_MSDU_PRESENT);
if (need_padding) {
memmove(skb->data + 2, skb->data, skb->len);