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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
prism54
/
islpci_mgt.c
diff --git
a/drivers/net/wireless/prism54/islpci_mgt.c
b/drivers/net/wireless/prism54/islpci_mgt.c
index
b6f2e5a
..
6a60c59
100644
(file)
--- a/
drivers/net/wireless/prism54/islpci_mgt.c
+++ b/
drivers/net/wireless/prism54/islpci_mgt.c
@@
-137,7
+137,7
@@
islpci_mgmt_rx_fill(struct net_device *ndev)
PCI_DMA_FROMDEVICE);
if (!buf->pci_addr) {
printk(KERN_WARNING
PCI_DMA_FROMDEVICE);
if (!buf->pci_addr) {
printk(KERN_WARNING
- "Failed to make memory DMA'able
\n.
");
+ "Failed to make memory DMA'able
.\n
");
return -ENOMEM;
}
}
return -ENOMEM;
}
}
@@
-455,7
+455,7
@@
islpci_mgt_transaction(struct net_device *ndev,
struct islpci_mgmtframe **recvframe)
{
islpci_private *priv = netdev_priv(ndev);
struct islpci_mgmtframe **recvframe)
{
islpci_private *priv = netdev_priv(ndev);
- const long wait_cycle_jiffies =
(ISL38XX_WAIT_CYCLE * 10 * HZ) / 1000
;
+ const long wait_cycle_jiffies =
msecs_to_jiffies(ISL38XX_WAIT_CYCLE * 10)
;
long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies;
int err;
DEFINE_WAIT(wait);
long timeout_left = ISL38XX_MAX_WAIT_CYCLES * wait_cycle_jiffies;
int err;
DEFINE_WAIT(wait);
@@
-475,8
+475,7
@@
islpci_mgt_transaction(struct net_device *ndev,
int timeleft;
struct islpci_mgmtframe *frame;
int timeleft;
struct islpci_mgmtframe *frame;
- set_current_state(TASK_UNINTERRUPTIBLE);
- timeleft = schedule_timeout(wait_cycle_jiffies);
+ timeleft = schedule_timeout_uninterruptible(wait_cycle_jiffies);
frame = xchg(&priv->mgmt_received, NULL);
if (frame) {
if (frame->header->oid == oid) {
frame = xchg(&priv->mgmt_received, NULL);
if (frame) {
if (frame->header->oid == oid) {