git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
hostap
/
hostap_hw.c
diff --git
a/drivers/net/wireless/hostap/hostap_hw.c
b/drivers/net/wireless/hostap/hostap_hw.c
index
d500012
..
328e9a1
100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_hw.c
+++ b/
drivers/net/wireless/hostap/hostap_hw.c
@@
-30,6
+30,7
@@
*/
*/
+#include <linux/config.h>
#include <asm/delay.h>
#include <asm/uaccess.h>
#include <asm/delay.h>
#include <asm/uaccess.h>
@@
-1042,9
+1043,6
@@
static int prism2_reset_port(struct net_device *dev)
dev->name, local->fragm_threshold);
}
dev->name, local->fragm_threshold);
}
- /* Some firmwares lose antenna selection settings on reset */
- (void) hostap_set_antsel(local);
-
return res;
}
return res;
}
@@
-3098,14
+3096,6
@@
static void prism2_clear_set_tim_queue(local_info_t *local)
}
}
-/*
- * HostAP uses two layers of net devices, where the inner
- * layer gets called all the time from the outer layer.
- * This is a natural nesting, which needs a split lock type.
- */
-static struct lock_class_key hostap_netdev_xmit_lock_key;
-
-
static struct net_device *
prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
struct device *sdev)
static struct net_device *
prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
struct device *sdev)
@@
-3270,8
+3260,6
@@
while (0)
SET_NETDEV_DEV(dev, sdev);
if (ret >= 0)
ret = register_netdevice(dev);
SET_NETDEV_DEV(dev, sdev);
if (ret >= 0)
ret = register_netdevice(dev);
-
- lockdep_set_class(&dev->_xmit_lock, &hostap_netdev_xmit_lock_key);
rtnl_unlock();
if (ret < 0) {
printk(KERN_WARNING "%s: register netdevice failed!\n",
rtnl_unlock();
if (ret < 0) {
printk(KERN_WARNING "%s: register netdevice failed!\n",