diff options
| author | John W. Linville | 2011-06-30 19:34:06 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-06-30 19:34:06 +0200 |
| commit | df2cbe40753dc36af294c30209ed909869aca6cf (patch) | |
| tree | 39eb7e8e06737b295007126f4e16c1b688427163 /drivers/net/wireless/libertas_tf | |
| parent | myri10ge: Update MAINTAINERS (diff) | |
| parent | rtlwifi: potential forever loop in rtl92de_hw_init() (diff) | |
| download | kernel-qcow2-linux-df2cbe40753dc36af294c30209ed909869aca6cf.tar.gz kernel-qcow2-linux-df2cbe40753dc36af294c30209ed909869aca6cf.tar.xz kernel-qcow2-linux-df2cbe40753dc36af294c30209ed909869aca6cf.zip | |
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.c | 2 |
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 5beb58142e97..acc461aa385e 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); |