← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/net/sb1000.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/sb1000.c
42
42
#include <linux/errno.h>
43
43
#include <linux/if_cablemodem.h> /* for SIOGCM/SIOSCM stuff */
44
44
#include <linux/in.h>
45
 
#include <linux/slab.h>
46
45
#include <linux/ioport.h>
47
46
#include <linux/netdevice.h>
48
47
#include <linux/if_arp.h>
52
51
#include <linux/pnp.h>
53
52
#include <linux/init.h>
54
53
#include <linux/bitops.h>
 
54
#include <linux/gfp.h>
55
55
 
56
56
#include <asm/io.h>
57
57
#include <asm/processor.h>
426
426
        if (sb1000_debug > 3)
427
427
                printk(KERN_DEBUG "%s: sb1000_send_command out: %02x%02x%02x%02x"
428
428
                        "%02x%02x\n", name, out[0], out[1], out[2], out[3], out[4], out[5]);
429
 
        return;
430
429
}
431
430
 
432
431
/* Card Read Status (to be used during frame rx) */
438
437
        in[3] = inb(ioaddr[0] + 3);
439
438
        in[4] = inb(ioaddr[0] + 4);
440
439
        in[0] = inb(ioaddr[0] + 5);
441
 
        return;
442
440
}
443
441
 
444
442
/* Issue Read Command (to be used during frame rx) */
450
448
        sb1000_wait_for_ready_clear(ioaddr, name);
451
449
        outb(0xa0, ioaddr[0] + 6);
452
450
        sb1000_send_command(ioaddr, name, Command0);
453
 
        return;
454
451
}
455
452
 
456
453
 
733
730
                        printk("\n");
734
731
                }
735
732
        }
736
 
        return;
737
733
}
738
734
 
739
735
/*
926
922
        sb1000_read_status(ioaddr, st);
927
923
        if (st[1] & 0x10)
928
924
                lp->rx_error_dpc_count = ErrorDpcCounterInitialize;
929
 
        return;
930
925
}
931
926
 
932
927
 
966
961
        lp->rx_error_count = 0;
967
962
        lp->rx_error_dpc_count = 0;
968
963
        lp->rx_session_id[0] = 0x50;
969
 
        lp->rx_session_id[0] = 0x48;
970
 
        lp->rx_session_id[0] = 0x44;
971
 
        lp->rx_session_id[0] = 0x42;
 
964
        lp->rx_session_id[1] = 0x48;
 
965
        lp->rx_session_id[2] = 0x44;
 
966
        lp->rx_session_id[3] = 0x42;
972
967
        lp->rx_frame_id[0] = 0;
973
968
        lp->rx_frame_id[1] = 0;
974
969
        lp->rx_frame_id[2] = 0;
975
970
        lp->rx_frame_id[3] = 0;
976
 
        if (request_irq(dev->irq, &sb1000_interrupt, 0, "sb1000", dev)) {
 
971
        if (request_irq(dev->irq, sb1000_interrupt, 0, "sb1000", dev)) {
977
972
                return -EAGAIN;
978
973
        }
979
974