1. 29 4月, 2007 33 次提交
  2. 28 4月, 2007 7 次提交
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · b9099ff6
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        sis900: Allocate rx replacement buffer before rx operation
        usb-net/pegasus: simplify carrier detection
      b9099ff6
    • N
      sis900: Allocate rx replacement buffer before rx operation · dc5a1449
      Neil Horman 提交于
      Just found a hole in my last patch.  It was reported to me that shortly after we
      integrated this patch.  The report was of an oops that took place inside of
      netif_rx when using the sis900 driver.  Looking at my origional patch I noted
      that there was a spot between the new skb_alloc and the refill_rx_ring label
      where skb got reassigned to the pointer currently held in the rx_ring for the
      purposes of receiveing the frame.  The result of this is however that the buffer
      that gets passed to netif_rx (if it is called), then gets placed right back into
      the rx_ring.  So if you receive frames fast enough the skb being processed by
      the network stack can get corrupted.  The reporter is testing out the fix I've
      written for this below (I'm not near my hardware at the moment to test myself),
      but I wanted to post it for review ASAP.  I'll post test results when I hear
      them, but I think this is a pretty straightforward fix.  It just uses a separate
      pointer to do the rx operation, so that we don't improperly reassign the pointer
      that we use to refill the rx ring.
      Signed-off-by: NNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      dc5a1449
    • D
      usb-net/pegasus: simplify carrier detection · 1764f150
      Dan Williams 提交于
      Simplify pegasus carrier detection; rely only on the periodic MII
      polling.  Reverts pieces of c43c49bd.
      Signed-off-by: NDan Williams <dcbw@redhat.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      1764f150
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 94015530
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SCSI] esp_scsi.c: Fix compilation.
      94015530
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 42fae7fb
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Fix networking compilation errors
        [AF_RXRPC/AFS]: Arch-specific fixes.
        [AFS]: Fix VLocation record update wakeup
        [NET]: Revert sk_buff walker cleanups.
      42fae7fb
    • L
      Merge git://git.infradead.org/mtd-2.6 · f0054636
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (46 commits)
        [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init()
        [MTD] [NAND] CM-x270 MTD driver
        [MTD] [NAND] Wrong calculation of page number in nand_block_bad()
        [MTD] [MAPS] fix plat-ram printk format
        [JFFS2] Fix compr_rubin.c build after include file elimination.
        [JFFS2] Handle inodes with only a single metadata node with non-zero isize
        [JFFS2] Tidy up licensing/copyright boilerplate.
        [MTD] [OneNAND] Exit loop only when column start with 0
        [MTD] [OneNAND] Fix access the past of the real oobfree array
        [MTD] [OneNAND] Update Samsung OneNAND official URL
        [JFFS2] Better fix for all-zero node headers
        [JFFS2] Improve read_inode memory usage, v2.
        [JFFS2] Improve failure mode if inode checking leaves unchecked space.
        [JFFS2] Fix cross-endian build.
        [MTD] Finish conversion mtd_blkdevs to use the kthread API
        [JFFS2] Obsolete dirent nodes immediately on unlink, where possible.
        Use menuconfig objects: MTD
        [MTD] mtd_blkdevs: Convert to use the kthread API
        [MTD] Fix fwh_lock locking
        [JFFS2] Speed up mount for directly-mapped NOR flash
        ...
      f0054636
    • A
      [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init() · 28b57cdd
      Adrian Bunk 提交于
      This patch converts the pci_module_init() usage to pci_register_driver().
      
      It's currently #if 0'ed, but still not a bad idea to change it.
      Signed-off-by: NAdrian Bunk <bunk@stusta.de>
      Signed-off-by: NDavid Woodhouse <dwmw2@infradead.org>
      28b57cdd