1. 20 Jun, 2004 40 commits
    • Jesper Juhl's avatar
      [PATCH] isp16 check_region() removal · d3230bfa
      Jesper Juhl authored
      Convert check_region to request_region and clean up some parentheses in
      return statements for drivers/cdrom/isp16.c.
      Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      d3230bfa
    • Andi Kleen's avatar
      [PATCH] NUMA API updates · 2150328b
      Andi Kleen authored
      This patch three issues in NUMA API
      
      - When 1 was passed to set_mempolicy or mbind as maxnodes argument
        get_nodes could corrupt the stack and cause a crash.  Fix that.
      
      - Remove the restriction to do interleaving only for order 0.  Together
        with the patch that went in previously to use interleaving policy at boot
        time this should give back the original behaviour of distributing the big
        hash tables.
      
      - Fix some bad white space in comments
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      2150328b
    • Chris Mason's avatar
      [PATCH] fix possible stack corruption during reiserfs_file_write · 0d8e8a6c
      Chris Mason authored
      With preallocation turned on, reiserfs_allocate_blocks_for_region wasn't
      sending a large enough array to hold all the blocks it was asking the block
      allocator to find.  This can result in stack corruption.
      
      The fix is to kmalloc an array to hold the blocks, making sure to allocate
      something large enough.
      
      There was also a recent optimization to force the allocator to find a free
      region large enough to hold the entire preallocation size.  This was
      sometimes causing more blocks to be allocated then had been requested,
      which would also overflow the array.  Something more elegant is required
      here, until then just disable the optimization.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      0d8e8a6c
    • Fabian Frederick's avatar
      2a70e21c
    • Hugh Dickins's avatar
      [PATCH] mprotect propagate anon_vma · 6eb47fb7
      Hugh Dickins authored
      When mprotect shifts the boundary between vmas (merging the reprotected
      area into the vma before or the vma after), make sure that the expanding
      vma has anon_vma if the shrinking vma had, to cover anon pages imported.
      Thanks to Andrea for alerting us to this oversight.
      
      Cc: <andrea@suse.de>
      Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      6eb47fb7
    • Jesse Barnes's avatar
      [PATCH] export sys_ioctl to modules · 46bb3931
      Jesse Barnes authored
      Small patch to export sys_ioctl if CONFIG_COMPAT is set.  This allows
      platforms to implement 32 bit compatibility ioctl handlers in modules.
      Submitted-by: default avatarJesse Barnes <jbarnes@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      46bb3931
    • Christoph Hellwig's avatar
      [PATCH] fix isdn to not assume mem*io return values · 09322980
      Christoph Hellwig authored
      These are defined like the normal ISO C mem* routines although x86 happens
      to return void by accident.  Fix isdn to not assume a return value.
      
      Sent to the isdn list, but as usual I didn't get any reply.
      
      The patch is from the Debian kernel package and really old.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      09322980
    • Gerd Knorr's avatar
      [PATCH] v4l: radio-zoltrix fix. · d5ea12f4
      Gerd Knorr authored
      From: Paul Focke <paul.focke@pandora.be>
      
      I recently upgraded from 2.4 to kernel 2.6 & noticed that the zoltrix radio
      driver was not working.  Seems like a little typo.  I tested this on my system
      and it's working fine now.  I doubt there are any other linux users in the
      world who still use this card ;-)
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      d5ea12f4
    • Gerd Knorr's avatar
      [PATCH] v4l: cx88 driver update · ed455954
      Gerd Knorr authored
      This is a update for the cx88 tv card driver.  Changes:
      
      * finally make it build with gcc 2.95 ;)
      
      * add new tv cards.
      
      * plenty of fixes for the TV sound code.
      
      * use v4l2 API for communication with tuner + tda9887
      
      * misc other minor stuff.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      ed455954
    • Gerd Knorr's avatar
      [PATCH] saa7134 driver update · 940a9e4a
      Gerd Knorr authored
      This is an update for the saa7134 driver.  Changes:
      
      
      * add support for more TV cards, as usual ;)
      
      * add support for image cropping.
      
      * use v4l2 API to talk to the tuner chips (thus it depends on the
        tuner/tda9887 patch).
      
      * fixes for the audio carrier scan.
      
      * make transport stream packet size configurable.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      940a9e4a
    • Gerd Knorr's avatar
      [PATCH] v4l: IR input driver update. · 581f0d1a
      Gerd Knorr authored
      This patch updates the ir-kbd-gpio and ir-kbd-i2c drivers.  Nothing major,
      just some keytable fixes and support for more hardware.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      581f0d1a
    • Gerd Knorr's avatar
      [PATCH] v4l: bttv driver update · 8bb4a936
      Gerd Knorr authored
      This is a update of the bttv driver.  Changes:
      
      * some card-specific fixes + new cards.
      
      * separate buffer switching for video frames and vbi data, that should make
        bttv less sensitive to high irq latencies.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      8bb4a936
    • Gerd Knorr's avatar
      [PATCH] v4l: tuner + tda9887 updates · e6cf179b
      Gerd Knorr authored
      This is a big update for the tuner and tda9887 modules which are used for TV
      card tuning.
      
      The tda9887 module is basically completely rewritten and understands all the
      config bits now instead of having just some fixed config presets.  Some of
      these config bits can be changed by insmod options now.
      
      The other big change is that both modules allow to use the V4L2 API for
      inter-module communication (i.e.  when bttv/saa7134/...  pass through the
      tuning ioctls to the modules).  That allows to specify the TV norm more
      precisely (not just PAL but PAL-I, PAL-BG, ...), which is needed in some cases
      to make TV audio work correctly.  Using the old v4l1 API is still possible so
      this shouldn't break any users of these two modules.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e6cf179b
    • Gerd Knorr's avatar
      [PATCH] v4l: ir-common update · 39871f0b
      Gerd Knorr authored
      Some minor changes for the ir-common module: Update for the RC5 keytable and
      increase the IR_KEYTAB_SIZE #define.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      39871f0b
    • Gerd Knorr's avatar
      [PATCH] v4l: msp3400 cleanup. · f3f0eb06
      Gerd Knorr authored
      This patch has some cleanups for the msp3400 module: Balance is used directly
      now instead of maintaining the state as left/right volume and calculate the
      balance from that.  The msp3400 did that only for historical reasons and it
      isn't needed any more ...
      
      Credits for that go to Perry Gilfillan.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f3f0eb06
    • Gerd Knorr's avatar
      [PATCH] v4l: video-buf fixes. · 8879ee9f
      Gerd Knorr authored
      This patch has some minor bugfixes for the video-buf module.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      8879ee9f
    • Gerd Knorr's avatar
      [PATCH] v4l: video-buf magic numbers · 800c5a77
      Gerd Knorr authored
      This patch adds some magic IDs and checks for them to the data structs of the
      video-buf module.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      800c5a77
    • Gerd Knorr's avatar
      [PATCH] v4l: update video-buf for per-frame input switching. · e6f32f39
      Gerd Knorr authored
      This patch updates the video-buf module to support the per-frame input
      switching added by the v4l2 API patch.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e6f32f39
    • Gerd Knorr's avatar
      [PATCH] v4l: v4l2 API updates · cc843d2e
      Gerd Knorr authored
      This patch has some minor updates to v4l2 API:
      
      * A new pixel format (V4L2_PIX_FMT_SBGGR8).
      
      * Adds some #defines for tv norms for convenience.
      
      * Allow to specify the video source to capture from on a per-frame basis.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      cc843d2e
    • Jens Axboe's avatar
      [PATCH] iommu max segment size · 2fed8438
      Jens Axboe authored
      This patch is from James, I've changed it slightly only.
      
      The problem is that some IOMMU implementations have a maximum limit to the
      size of the number of contiguously mappable pages (admittedly, this limit
      is mostly in the resource management algorithms rather than the IOMMUs
      themselves).
      
      This patch adds this concept to the bio layer via the parameter
      
      BIO_VMERGE_MAX_SIZE
      
      which architectures can define in asm/io.h (if undefined, we assume it to
      be infinite, which is current behaviour).
      
      While adding this, I noticed several places where bio was making incorrect
      assumptions about virtual mergeability (none of which was a bug: bio was
      overestimating rather than underestimating).
      
      - The worst offender was bio_add_page(), which seemed never to check for
        virtual mergeability
      
      - I also fixed blk_hw_contig_segments() not to check the QUEUE_CLUSTER
        flag, and not to check the phys segment boundary.
      
      In order to track the hw segment size across bios, I had to introduce two
      extra bio parameters: bi_hw_front_size and bi_hw_back_size which store the
      sizes of the front and back hw contiguous segments (and which will be equal
      if there's only one hw segment).  When the bio is merged into a request,
      these fields are updated with the total hw contig size so they can always
      be used to assess if the merger would violate the BIO_VMERGE_MAX_SIZE
      parameter.
      Signed-Off-By: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      2fed8438
    • Dean Nelson's avatar
      [PATCH] add wait_event_interruptible_exclusive() macro · a2816bbf
      Dean Nelson authored
      This patch defines a macro that does exactly what
      wait_event_interruptible() does except that it adds the current task to the
      wait queue as an exclusive task (i.e., sets the WQ_FLAG_EXCLUSIVE flag)
      rather than as a non-exclusive task as wait_event_interruptible() does.
      
      This allows one to do a wake_up_nr() to wake up a specific number of tasks.
       I'm in the process of submitting a patch to linux-ia64 that requires this
      capability.  (Its subject line is "[PATCH 3/4] SGI Altix cross partition
      functionality".)
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      a2816bbf
    • Mika Kukkonen's avatar
      [PATCH] Uninline machine_specific_memory_setup() · c87c2fe1
      Mika Kukkonen authored
      Cleanup arch/i386/kernel/setup.c a little bit by:
      
      * un-inlining machine_specific_memory_setup() (it's implementations are
        pretty big to be inlined anyway)
      
      * remove setup_memory_region() by moving the code inside setup_arch()
      
      I would also recommend BK-renaming all four files
      (include/asm-i386/*/setup_arch_post.h) to ".c" and moving them into
      arch/i386/*/, but that obviously is not needed in anyway.  But IMHO they
      are clearly ".c" files, not ".h" files.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      c87c2fe1
    • Mark W. McClelland's avatar
      [PATCH] Add ovcamchip driver · 9b3b3c3b
      Mark W. McClelland authored
      This patch adds a new driver for the OmniVision OV6xx0 and OV7xx0 series of
      CMOS image sensors.  It is currently used by the w9968cf USB webcam driver,
      which is already in mainline 2.6.  Up until now it had to be compiled
      outside the kernel tree, which is clearly suboptimal.
      
      It is also used by version 2 of the ov511 USB webcam driver, which will be
      merged in the near future.  That will reduce some code duplication, since
      the existing ov511 has much of this code built-in.
      
      This was previously submitted to Linux-USB-Devel, and I have fixed the
      concerns that came up at that time.
      
      Developer's Certificate of Origin 1.0
      
      By making a contribution to this project, I certify that:
      
      (a) The contribution was created in whole or in part by me and I
              have the right to submit it under the open source license
              indicated in the file; or
      
      (b) The contribution is based upon previous work that, to the best
              of my knowledge, is covered under an appropriate open source
              license and I have the right under that license to submit that
              work with modifications, whether created in whole or in part
              by me, under the same open source license (unless I am
              by me, under the same open source license (unless I am
              permitted to submit under a different license), as indicated
              in the file; or
      
      (c) The contribution was provided directly to me by some other
              person who certified (a), (b) or (c) and I have not modified
              it.
      Signed-off-by: default avatarMark McClelland <mark@alpha.dyndns.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      9b3b3c3b
    • Andrew Morton's avatar
      [PATCH] swapoff: activate pages · dd254918
      Andrew Morton authored
      People like to use swapoff/swapon as a way of restoring their VM to a
      predictable "preconditional" state.
      
      Problem is, swapoff leaves mapped anon/pagecache pages on the inactive list,
      so they immediately get swapped out again when swapspace becomes available.
      
      Let's move these pages onto the active list to the VM has to again decide
      whether to swap them out.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      dd254918
    • Dave Kleikamp's avatar
      [PATCH] jfs build fix · 7d28f09f
      Dave Kleikamp authored
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      7d28f09f
    • Alexander Viro's avatar
      [PATCH] airo.c broke · 86b3176e
      Alexander Viro authored
      But Al fixed it again.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      86b3176e
    • Paul Fulghum's avatar
      [PATCH] ppp_synctty.c receive/write_wakeup fix · f803ee7a
      Paul Fulghum authored
      Allow receive and write_wakeup callbacks to be called at hard interrupt
      context and/or with interrupts disabled (removes softirq warning).
      
      This mirrors changes by Paul Mackerras to ppp_async.c for the same purpose.
      Patch has been previously posted for comments and has been tested with
      success by multiple persons.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f803ee7a
    • Cesar Eduardo Barros's avatar
      [PATCH] O_NOATIME support · 5a86174c
      Cesar Eduardo Barros authored
      This patch adds support for the O_NOATIME open flag (GNU extension):
      
      int O_NOATIME  	Macro
        If this bit is set, read will not update the access time of the file.
        See File Times. This is used by programs that do backups, so that
        backing a file up does not count as reading it. Only the owner of the
        file or the superuser may use this bit.
      
      It is useful if you want to do something with the file atime (for instance,
      moving files that have not been accessed in a while to somewhere else, or
      something like Debian's popularity-contest) but you also want to read all
      files periodically (for instance, tripwire or debsums).
      
      Currently, the program that reads all files periodically has to use utimes,
      which can race with the atime update:
      
          A               B
        open
        fstat
        read
                        open
                        read
                        close
        close
        utimes
      
      And the file still has the old atime, instead of the new one from when B
      did the read from it.  This problem does not happen if A uses O_NOATIME
      instead of utimes to preserve the atime.
      
      This patch adds the O_NOATIME constant for all architectures, but it would
      also be possible to add it one architecture at a time by defining it to 0
      when not defined in asm-*.
      
      Based on patch by Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> at
      http://www.uwsg.iu.edu/hypermail/linux/kernel/9811.2/0118.htmlSigned-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      5a86174c
    • David Howells's avatar
      [PATCH] Permit inode & dentry hash tables to be allocated > MAX_ORDER size · 17e14bef
      David Howells authored
      Here's a patch to allocate memory for big system hash tables with the
      bootmem allocator rather than with main page allocator.
      
      It is needed for three reasons:
      
      (1) So that the size can be bigger than MAX_ORDER.  IBM have done some
          testing on their big PPC64 systems (64GB of RAM) with linux-2.4 and found
          that they get better performance if the sizes of the inode cache hash,
          dentry cache hash, buffer head hash and page cache hash are increased
          beyond MAX_ORDER (order 11).
      
           Now the main allocator can't allocate anything larger than MAX_ORDER, but
           the bootmem allocator can.
      
           In 2.6 it appears that only the inode and dentry hashes remain of those
           four, but there are other hash tables that could use this service.
      
      (2) Changing MAX_ORDER appears to have a number of effects beyond just
          limiting the maximum size that can be allocated in one go.
      
      (3) Should someone want a hash table in which each bucket isn't a power of
          two in size, memory will be wasted as the chunk of memory allocated will
          be a power of two in size (to hold a power of two number of buckets).
      
          On the other hand, using the bootmem allocator means the allocation
          will only take up sufficient pages to hold it, rather than the next power
          of two up.
      
          Admittedly, this point doesn't apply to the dentry and inode hashes,
          but it might to another hash table that might want to use this service.
      
      
      I've coelesced the meat of the inode and dentry allocation routines into
      one such routine in mm/page_alloc.c that the the respective initialisation
      functions now call before mem_init() is called.
      
      This routine gets it's approximation of memory size by counting up the
      ZONE_NORMAL and ZONE_DMA pages (and ZONE_HIGHMEM if requested) in all the
      nodes passed to the main allocator by paging_init() (or wherever the arch
      does it).  It does not use max_low_pfn as that doesn't seem to be available
      on all archs, and it doesn't use num_physpages since that includes highmem
      pages not available to the kernel for allocating data structures upon -
      which may not be appropriate when calculating hash table size.
      
      On the off chance that the size of each hash bucket may not be exactly a
      power of two, the routine will only allocate as many pages as is necessary
      to ensure that the number of buckets is exactly a power of two, rather than
      allocating the smallest power-of-two sized chunk of memory that will hold
      the same array of buckets.
      
      The maximum size of any single hash table is given by
      MAX_SYS_HASH_TABLE_ORDER, as is now defined in linux/mmzone.h.
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      17e14bef
    • Daniel Ritz's avatar
      [PATCH] pcmcia: enable read prefetch on o2micro bridges to fix HDSP · f9e60d7b
      Daniel Ritz authored
      enable read prefetching on O2micro bridges. It fixes the problems
      seen with the RME Hammerfall DSP.
      Thanks to Eric Still from O2micro for the input.
      
      Cc: Russell King <rmk@arm.linux.org.uk>
      Signed-off-by: default avatarDaniel Ritz <daniel.ritz@gmx.ch>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f9e60d7b
    • Andrey Panin's avatar
      [PATCH] use new DMI API for HP Pavilion · f1ddf228
      Andrey Panin authored
      Example code for the new DMI APU - port HP Pavilion irq workaround to new
      DMI probing.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f1ddf228
    • Andrey Panin's avatar
      [PATCH] export DMI check functions · efd3d374
      Andrey Panin authored
      This patch creates and exports 2 functions which can be used by the rest of
      kernel code to perform DMI data checks:
      
      - dmi_check_system() function checks system DMI data against given blacklist
        table and on each match runs corresponding callback function;
      
      - dmi_get_system_info() function returns DMI data value.  Useful for people
        wanting more complex DMI data check than simple string match.
      
      Also filling unused match entries with NO_MATCH made optional, but existing
      NO_MATCH occurences are left intact, so people are free to continue dmi_scan.c
      patching without massive reject problems.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      efd3d374
    • Andrew Morton's avatar
      [PATCH] ppc64: eeh.h warning-fix · c397fc82
      Andrew Morton authored
      In file included from include/asm/io.h:365,
                       from drivers/video/kyro/STG4000Reg.h:23,
                       from drivers/video/kyro/STG4000Ramdac.c:16:
      include/asm/eeh.h:58: warning: `struct device_node' declared inside parameter list
      include/asm/eeh.h:58: warning: its scope is only this definition or declaration, which is probably not what you want
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      c397fc82
    • Andrew Morton's avatar
      [PATCH] ppc64 CONFIG_ALTIVEC=n build fix · 4f6d91e3
      Andrew Morton authored
      With CONFIG_ALTIVEC=n, flush_altivec_to_thread() has no implementation.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      4f6d91e3
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net/davem/sparc-2.6 · d2cc3f56
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      d2cc3f56
    • Arthur Kepner's avatar
      567f4872
    • David S. Miller's avatar
      Merge bk://kernel.bkbits.net/acme/net-2.6 · e2580c9e
      David S. Miller authored
      into nuts.davemloft.net:/disk1/BK/net-2.6
      e2580c9e
    • Arnaldo Carvalho de Melo's avatar
    • Arnaldo Carvalho de Melo's avatar
      [NET] move skb_can_coalesce to skbuff.h · 86adf644
      Arnaldo Carvalho de Melo authored
      This one also removes the duplicate can_coalesce in tcp.c and makes it
      use skb_can_coalesce.
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@conectiva.com.br>
      86adf644
    • David S. Miller's avatar
      Merge nuts.davemloft.net:/disk1/BK/acme-2.6 · c53373b8
      David S. Miller authored
      into nuts.davemloft.net:/disk1/BK/net-2.6
      c53373b8