UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] orinoco: misc fixes 

small fixes from CVS that didn't fit elsewhere

Index: linux-2.6/drivers/net/wireless/orinoco.c
===================================================================
This commit is contained in:
Christoph Hellwig 2005-05-14 17:30:22 +02:00 committed by Jeff Garzik
parent ad8f451b41
commit 84d8a2fb56
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/wireless/orinoco.c
View File

@ -1280,9 +1280,10 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
len = sizeof(tallies); len = sizeof(tallies);
} }
/* Read directly the data (no seek) */ err = hermes_bap_pread(hw, IRQ_BAP, &tallies, len,
hermes_read_words(hw, HERMES_DATA1, (void *) &tallies, infofid, sizeof(info));
len / 2); /* FIXME: blech! */ if (err)
break;
/* Increment our various counters */ /* Increment our various counters */
/* wstats->discard.nwid - no wrong BSSID stuff */ /* wstats->discard.nwid - no wrong BSSID stuff */
@ -1312,8 +1313,10 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
break; break;
} }
hermes_read_words(hw, HERMES_DATA1, (void *) &linkstatus, err = hermes_bap_pread(hw, IRQ_BAP, &linkstatus, len,
len / 2); infofid, sizeof(info));
if (err)
break;
newstatus = le16_to_cpu(linkstatus.linkstatus); newstatus = le16_to_cpu(linkstatus.linkstatus);
connected = (newstatus == HERMES_LINKSTATUS_CONNECTED) connected = (newstatus == HERMES_LINKSTATUS_CONNECTED)
@ -1355,6 +1358,8 @@ int __orinoco_up(struct net_device *dev)
struct hermes *hw = &priv->hw; struct hermes *hw = &priv->hw;
int err; int err;
netif_carrier_off(dev); /* just to make sure */
err = __orinoco_program_rids(dev); err = __orinoco_program_rids(dev);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d configuring card\n", printk(KERN_ERR "%s: Error %d configuring card\n",
@ -2063,7 +2068,7 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if (events & HERMES_EV_ALLOC) if (events & HERMES_EV_ALLOC)
__orinoco_ev_alloc(dev, hw); __orinoco_ev_alloc(dev, hw);
hermes_write_regn(hw, EVACK, events); hermes_write_regn(hw, EVACK, evstat);
evstat = hermes_read_regn(hw, EVSTAT); evstat = hermes_read_regn(hw, EVSTAT);
events = evstat & hw->inten; events = evstat & hw->inten;
@ -2440,7 +2445,7 @@ struct net_device *alloc_orinocodev(int sizeof_card,
priv = netdev_priv(dev); priv = netdev_priv(dev);
priv->ndev = dev; priv->ndev = dev;
if (sizeof_card) if (sizeof_card)
priv->card = (void *)((unsigned long)netdev_priv(dev) priv->card = (void *)((unsigned long)priv
+ sizeof(struct orinoco_private)); + sizeof(struct orinoco_private));
else else
priv->card = NULL; priv->card = NULL;
@ -2545,6 +2550,7 @@ static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
} }
len = le16_to_cpu(essidbuf.len); len = le16_to_cpu(essidbuf.len);
BUG_ON(len > IW_ESSID_MAX_SIZE);
memset(buf, 0, IW_ESSID_MAX_SIZE+1); memset(buf, 0, IW_ESSID_MAX_SIZE+1);
memcpy(buf, p, len); memcpy(buf, p, len);