aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [MAINTAINERS]: correct location for net-2.6.gitJohn W. Linville2006-01-18
| | | | | | | Correct location info for net-2.6 git tree. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge git://tipc.cslab.ericsson.net/pub/git/tipcDavid S. Miller2006-01-18
|\
| * [TIPC] Avoid polluting the global namespacePer Liden2006-01-17
| | | | | | | | | | | | This patch adds a tipc_ prefix to all externally visible symbols. Signed-off-by: Per Liden <per.liden@ericsson.com>
| * [TIPC] Group protocols with sub-options in KconfigPer Liden2006-01-17
| | | | | | | | | | | | | | | | This is just a cosmetic change that moves the TIPC configuration entry next to the other protocols that also have sub-options. Makes the the networking options menu look a bit better. Signed-off-by: Per Liden <per.liden@ericsson.com>
| * [TIPC] Add help text for TIPC configuration optionPer Liden2006-01-17
| | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| * [TIPC] Remove unused #includesPer Liden2006-01-17
| | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| * [TIPC] Move ethernet protocol id to linux/if_ether.hPer Liden2006-01-17
| | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| * [TIPC] Provide real email addresses in MAINTAINERSPer Liden2006-01-17
| | | | | | | | Signed-off-by: Per Liden <per.liden@ericsson.com>
| * [TIPC] Updated link priority macrosPer Liden2006-01-17
| | | | | | | | | | | | | | | | Added macros for min/default/max link priority in tipc_config.h. Also renamed TIPC_NUM_LINK_PRI to TIPC_MEDIA_LINK_PRI since that is a more accurate description of what it is used for. Signed-off-by: Per Liden <per.liden@ericsson.com>
| * [TIPC] Minor changes to #includesJon Maloy2006-01-17
| | | | | | | | Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
* | [IPV4]: Fix multiple bugs in IGMPv3David L Stevens2006-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) fix "mld_marksources()" to a) send nothing when all queried sources are excluded b) send full exclude report when source queried sources are not excluded c) don't schedule a timer when there's nothing to report 2) fix "add_grec()" to send empty-source records when it should The original check doesn't account for a non-empty source list with all sources inactive; the new code keeps that short-circuit case, and also generates the group header with an empty list if needed. 3) fix mca_crcount decrement to be after add_grec(), which needs its original value 4) add/remove delete records and prevent current advertisements when an exclude-mode filter moves from "active" to "inactive" or vice versa based on new filter additions. Items 1-3 are just IPv4 versions of the IPv6 bugs found by Yan Zheng and fixed earlier. Item #4 is a related bug that affects exclude-mode change records only (but not queries) and also occurs in IPv6 (IPv6 version coming soon). Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PKTGEN]: Respect hard_header_len of device.David S. Miller2006-01-18
| | | | | | | | | | | | | | | | Don't assume 16. Found by Ben Greear. Signed-off-by: David S. Miller <davem@davemloft.net>
* | [IRDA]: maintainer statusStephen Hemminger2006-01-18
| | | | | | | | | | | | | | | | Jean says he really doesn't have time to much IRDA any more. The following would help motivate someone who has more time. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [CASSINI]: dont touch page_countNick Piggin2006-01-18
| | | | | | | | | | | | | | | | Remove page refcount manipulations from cassini driver by using another field in struct page. Needed for lockless pagecache. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [IPV4]: RT_CACHE_STAT_INC() warning fixAndrew Morton2006-01-18
| | | | | | | | | | | | | | | | | | BUG: using smp_processor_id() in preemptible [00000001] code: rpc.statd/2408 And it _is_ a bug, but I guess we don't care enough to add preempt_disable(). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds2006-01-17
|\ \
| * | [XFS] Fix a race in xfs_submit_ioend() where we can be completing I/O forDavid Chinner2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a page while we are still submitting other buffers on the same page for I/O. SGI-PV: 948197 SGI-Modid: xfs-linux-melb:xfs-kern:25004a Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Nathan Scott <nathans@sgi.com>
* | | Merge branch 'upstream-linus' of ↵Linus Torvalds2006-01-17
|\ \ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | | [PATCH] libata: Code for the IRQ mask flagAlan Cox2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Somewhat cleaner in the resync as someone cleaned up the pio xfer users Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: Fix sector lock to apply to both drives not drive 0 twiceAlan Cox2006-01-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: Fix heuristic typos add LBA48PIO flag and support code, add ↵Alan Cox2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | IRQ flag for next diff Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] Intel ICH8 SATA: add PCI device IDsJason Gaston2006-01-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: add a function to decide if we need iordyAlan Cox2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This ought to be simple but for PIO2 we have to poke around the drive data to get it 100% correct. Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata: Pre UDMA EIDE PIO mode selectionAlan Cox2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I misread the spec when doing the original. I've tested the corrected version with pre UDMA drives and it now picks the right modes. This is a specific bug fix rather than an update or new feature item. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [libata] sata_promise: add pci idYusuf Iskenderoglu2006-01-17
| | | |
| * | | [libata] sata_svw: add pci idOliver Weihe2006-01-17
| | | |
| * | | [PATCH] ahci: AHCI mode SATA patch for Intel ICH8Jason Gaston2006-01-17
| |/ / | | | | | | | | | | | | | | | | | | | | | This patch adds the Intel ICH8 DID's to the ahci.c file for AHCI mode SATA support. Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Merge branch 'upstream-linus' of ↵Linus Torvalds2006-01-17
|\ \ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * | | [PATCH] skge: fix dma mask setup.Stephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a couple of problems in the DMA setup code for skge. * In the 64 bit case, it doesn't set the consistent mask. * In the 32 bit case, the error check is backwards! It likely will only be visible as a bug on 64 bit platforms. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] Fix warning with b44.c on 64bit boxesAlan Cox2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sizeof() return is not an int, so use max_t to get the types right. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: 0.13 versionStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: more conservative transmit lockingStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more careful about transmit locking, this solves a possible race between tx_complete and transmit, that would cause a tx timeout. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: don't inline so muchStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't need to inline quite so many routines, let the compiler decide Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: use kzallocStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Can use kzalloc here. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: ratelimit error messagesStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure and rate limit all the error messages that might occur. If a problem occurs then a few messages are enough. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: optimize for 32 bit dmaStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small optimization, if dma addresses are 32 bits, then high bits are always zero. Signed-off-by: Stephen Hemminger <shemminger@osdl.or> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: don't bother clearing status ring elementsStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't need to zero out the status ring entries after processing. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: write barrier'sStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more careful about memory barriers. The only place we really need them is before and after updating the chip's ring interface. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: fix ram buffer for Yukon FE rev 2Stephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with Yukon FE rev 2 chipset. Don't cut and paste bugs in from sk98lin driver. Change how the ram buffer is divided up, and make the math clearer. Also, set the thresholds where rx takes precedence. The threshold values are just guesses at this point, it might be worth tuning them later. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: version 0.12Stephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Version update. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: call pci_set_consistent_dma_maskStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to call pci_set_consistent_dma_mask in the case of 64 bit DMA. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] sky2: receive buffer alignmentStephen Hemminger2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to make sure that sky2 receive buffers are 64 bit aligned. Also, don't need to start off with GFP_ATOMIC on initial setup. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] e100: e100 whitespace fixesJesse Brandeburg2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e100: e100 whitespace fixes These are whitespace only fixes. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] e100: Handle the return values from pci_* functionsJesse Brandeburg2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e100: Handle the return values from pci_* functions This is to resolve warnings during compile time. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue)Jesse Brandeburg2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue) Set the end of list bit to cause the hardware's transmit state machine to work correctly and not prevent management (BMC) traffic. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | airo: Off-by-one channel fixJavier Achirica2006-01-17
| | | |
| * | | [PATCH] e1000: Removed unused variables and initialized variablesJeff Kirsher2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] e1000: Cleaned up code and removed hard coded numbersJeff Kirsher2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] e1000: Added copy break codeJeff Kirsher2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves small packet performance with large amounts of reassembly being done in the stack. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] e1000: Added variable to handle return values for pci_enable_* functionsJeff Kirsher2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was to fix compilation warnings. Also added log messages when pci_enable_* functions return with an error. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>