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

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)
         struct ap_data *ap = data;
         struct net_device *dev = ap->local->dev;
         struct ieee80211_hdr *hdr;
-        u16 fc, status;
+        u16 status;
         __le16 *pos;
         struct sta_info *sta = NULL;
         char *txt = NULL;
@@ -699,7 +699,6 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
         }
 
         hdr = (struct ieee80211_hdr *) skb->data;
-        fc = le16_to_cpu(hdr->frame_control);
         if ((!ieee80211_is_assoc_resp(hdr->frame_control) &&
              !ieee80211_is_reassoc_resp(hdr->frame_control)) ||
             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)
         local_info_t *local =
                 container_of(work, local_info_t, set_multicast_list_queue);
         struct net_device *dev = local->dev;
-        struct hostap_interface *iface;
 
-        iface = netdev_priv(dev);
         if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,
                             local->is_promisc)) {
                 printk(KERN_INFO "%s: %sabling promiscuous mode failed\n",