aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/hostap')
-rw-r--r--drivers/net/wireless/hostap/hostap_ap.c3
-rw-r--r--drivers/net/wireless/hostap/hostap_main.c2
2 files changed, 1 insertions, 4 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) {
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index eb57d1ea361f..eaee84b55887 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -741,9 +741,7 @@ void hostap_set_multicast_list_queue(struct work_struct *work)
741 local_info_t *local = 741 local_info_t *local =
742 container_of(work, local_info_t, set_multicast_list_queue); 742 container_of(work, local_info_t, set_multicast_list_queue);
743 struct net_device *dev = local->dev; 743 struct net_device *dev = local->dev;
744 struct hostap_interface *iface;
745 744
746 iface = netdev_priv(dev);
747 if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE, 745 if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,
748 local->is_promisc)) { 746 local->is_promisc)) {
749 printk(KERN_INFO "%s: %sabling promiscuous mode failed\n", 747 printk(KERN_INFO "%s: %sabling promiscuous mode failed\n",