diff options
author | David S. Miller <davem@davemloft.net> | 2010-07-01 20:34:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-01 20:34:14 -0400 |
commit | 05318bc905467237d4aa68a701f6e92a2b332218 (patch) | |
tree | 3b7577383bca50aeb442568aa16cf8f2167b8694 /drivers/net/wireless/hostap/hostap_ap.c | |
parent | ea812ca1b06113597adcd8e70c0f84a413d97544 (diff) | |
parent | 88c1f4f6dffe66e2fed8e7e3276e091ee850bed0 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/libertas/host.h
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ap.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_ap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 231dbd77f5f5..9cadaa296fac 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c | |||
@@ -688,7 +688,7 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data) | |||
688 | struct ap_data *ap = data; | 688 | struct ap_data *ap = data; |
689 | struct net_device *dev = ap->local->dev; | 689 | struct net_device *dev = ap->local->dev; |
690 | struct ieee80211_hdr *hdr; | 690 | struct ieee80211_hdr *hdr; |
691 | u16 fc, status; | 691 | u16 status; |
692 | __le16 *pos; | 692 | __le16 *pos; |
693 | struct sta_info *sta = NULL; | 693 | struct sta_info *sta = NULL; |
694 | char *txt = NULL; | 694 | char *txt = NULL; |
@@ -699,7 +699,6 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data) | |||
699 | } | 699 | } |
700 | 700 | ||
701 | hdr = (struct ieee80211_hdr *) skb->data; | 701 | hdr = (struct ieee80211_hdr *) skb->data; |
702 | fc = le16_to_cpu(hdr->frame_control); | ||
703 | if ((!ieee80211_is_assoc_resp(hdr->frame_control) && | 702 | if ((!ieee80211_is_assoc_resp(hdr->frame_control) && |
704 | !ieee80211_is_reassoc_resp(hdr->frame_control)) || | 703 | !ieee80211_is_reassoc_resp(hdr->frame_control)) || |
705 | skb->len < IEEE80211_MGMT_HDR_LEN + 4) { | 704 | skb->len < IEEE80211_MGMT_HDR_LEN + 4) { |