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

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into tmp

This commit is contained in:
Jeff Garzik 2007-03-23 01:51:20 -04:00
parent 194c1fbe43 4d881901b8
commit 604119a4b2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/airo.c
View File

@ -2852,7 +2852,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
if (rc) {
airo_print_err(dev->name, "register interrupt %d failed, rc %d",
irq, rc);
goto err_out_unlink;
goto err_out_nets;
}
if (!is_pcmcia) {
if (!request_region( dev->base_addr, 64, dev->name )) {
@ -2935,6 +2935,8 @@ err_out_res:
release_region( dev->base_addr, 64 );
err_out_irq:
free_irq(dev->irq, dev);
err_out_nets:
airo_networks_free(ai);
err_out_unlink:
del_airo_dev(dev);
err_out_thr:

14
drivers/net/wireless/bcm43xx/bcm43xx_radio.c
View File

@ -882,10 +882,10 @@ static void _stack_save(u32 *_stackptr, size_t *stackidx,
{
u32 *stackptr = &(_stackptr[*stackidx]);
assert((offset & 0xF000) == 0x0000);
assert((id & 0xF0) == 0x00);
assert((offset & 0xE000) == 0x0000);
assert((id & 0xF8) == 0x00);
*stackptr = offset;
*stackptr |= ((u32)id) << 12;
*stackptr |= ((u32)id) << 13;
*stackptr |= ((u32)value) << 16;
(*stackidx)++;
assert(*stackidx < BCM43xx_INTERFSTACK_SIZE);
@ -896,12 +896,12 @@ static u16 _stack_restore(u32 *stackptr,
{
size_t i;
assert((offset & 0xF000) == 0x0000);
assert((id & 0xF0) == 0x00);
assert((offset & 0xE000) == 0x0000);
assert((id & 0xF8) == 0x00);
for (i = 0; i < BCM43xx_INTERFSTACK_SIZE; i++, stackptr++) {
if ((*stackptr & 0x00000FFF) != offset)
if ((*stackptr & 0x00001FFF) != offset)
continue;
if (((*stackptr & 0x0000F000) >> 12) != id)
if (((*stackptr & 0x00007000) >> 13) != id)
continue;
return ((*stackptr & 0xFFFF0000) >> 16);
}