Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / staging / rtl8187se / ieee80211 / ieee80211_softmac.c

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 00ee02f..38e67f0 100644 (file)
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -19,7 +19,6 @@
 #include <linux/random.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 #include <linux/interrupt.h>
 #include <asm/uaccess.h>
 
@@ -822,7 +821,7 @@ static struct sk_buff* ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
                cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_IBSS);
 
        if(ieee->short_slot && (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT))
-               cpu_to_le16((beacon_buf->capability |= WLAN_CAPABILITY_SHORT_SLOT));
+               beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
 
        crypt = ieee->crypt[ieee->tx_keyidx];
 
@@ -2569,11 +2568,8 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
        ieee->beacon_timer.data = (unsigned long) ieee;
        ieee->beacon_timer.function = ieee80211_send_beacon_cb;
 
-#ifdef PF_SYNCTHREAD
-       ieee->wq = create_workqueue(DRV_NAME,0);
-#else
        ieee->wq = create_workqueue(DRV_NAME);
-#endif
+
        INIT_DELAYED_WORK(&ieee->start_ibss_wq,(void*) ieee80211_start_ibss_wq);
        INIT_WORK(&ieee->associate_complete_wq,(void*) ieee80211_associate_complete_wq);
        INIT_WORK(&ieee->associate_procedure_wq,(void*) ieee80211_associate_procedure_wq);