1. 22 May, 2004 35 commits
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net/davem/net-2.6 · a20a9dee
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      a20a9dee
    • Linus Torvalds's avatar
      Avoid type warning in comparison by making it explicit. · 4d4aaa67
      Linus Torvalds authored
      (The difference between two pointers is a "size_t", while
      MAX_LEN and the result here are "int"s).
      4d4aaa67
    • Stephen Hemminger's avatar
      [BRIDGE]: Forwarding table sanity checks. · 649f71c5
      Stephen Hemminger authored
      Forwarding table paranoia:
      * Solve some potential problems if a device changes address and one or
        more device has the same address.  
      * Warn if new device added to a bridge matches a entry that has shown
        up on the network.
      * Also don't put static entries in the timer list, they don't time
        out so shouldn't be there.
      649f71c5
    • Stephen Hemminger's avatar
      [BRIDGE]: Compat hooks for new-ioctl interface. · d6bd6619
      Stephen Hemminger authored
      Replacement 64 bit compatibility code for the new ioctl's.  The new 
      ioctl's all pass through clean, but for the old style ioctl's it uses
      the mis-feature of the earlier bridge-utils that they check the API version.
      
      So if an old 32bit version of brctl is run on a 64bit platform it will
      report
      	bridge utilities not compatible with kernel version
      
      Tested on Itanium 1; but should solve issue for sparc, ppc, and x86_64
      d6bd6619
    • Stephen Hemminger's avatar
      [BRIDGE]: New ioctl interface for 32/64 compatability. · 5075405c
      Stephen Hemminger authored
      Add four new ioctl's for the operations that can't be done through sysfs.
      The existing bridge ioctl's are multiplexed, and most go through SIOCDEVPRIVATE
      so they won't work in a mixed 32/64bit environment.
      
      The new release of bridge-utils will use these if possible, and fall
      back to the old interface.
      5075405c
    • Stephen Hemminger's avatar
      [BRIDGE]: Add sysfs support. · 3d702922
      Stephen Hemminger authored
      3d702922
    • Stephen Hemminger's avatar
      [BRIDGE]: Expose timer_residue function for use by sysfs. · f1d65789
      Stephen Hemminger authored
      Move the local function timer_residue to br_timer_value so it can
      be used by both ioctl and sysfs code.
      f1d65789
    • Stephen Hemminger's avatar
      [BRIDGE]: Read forwarding table chunk at a time. · 7e40dbf8
      Stephen Hemminger authored
      Change how the read of forwarding table works.  Instead of copying
      entries to user one at a time, use an intermediate kernel buffer and
      do up to a page at a chunk.
      
      This gets rid of some awkward code dealing with entries getting deleted
      during the copy.  And allows same function to be used by later sysfs
      hook.
      7e40dbf8
    • Stephen Hemminger's avatar
      [BRIDGE]: Fix deadlock on device removal. · 367c89b5
      Stephen Hemminger authored
      Fix a deadlock where deleting a device call br_del_if with lock held.
      br_del_if doesn't want to be called under lock anymore.
      367c89b5
    • Stephen Hemminger's avatar
      [BRIDGE]: Ioctl cleanup and consolidation. · 39b81cce
      Stephen Hemminger authored
      Merge the ioctl stub calls that just end up calling the sub-function
      to do the actual ioctl.  Move br_get_XXX_ifindices into the ioctl file
      as well where they can be static.
      39b81cce
    • Stephen Hemminger's avatar
      [BRIDGE]: Relax locking on add/delete. · af13a450
      Stephen Hemminger authored
      Relax the locking on add/delete interfaces to a bridge.  Since these operations
      are already called with RTNL semaphore, only need to hold the bridge lock while
      doing operations related to STP and processing path.  This is necessary for later
      sysfs support where those operations might sleep.
      af13a450
    • Stephen Hemminger's avatar
      [BRIDGE]: Cleanup of bridge allocation. · 20d50e8c
      Stephen Hemminger authored
      Minor cleanup (lead in to later sysfs support).  
      Change new_nb to new_bridge_dev and return the net_device rather than
      bridge because that is what the caller wants anyway.
      20d50e8c
    • Stephen Hemminger's avatar
      [BRIDGE]: Handle delete of multiple devices with same address. · c5c0a0e3
      Stephen Hemminger authored
      This fixes the issue discovered when removing bluetooth devices from a bridge.
      Need to add special case code when forwarding table is being cleaned up to 
      handle the case where several devices share the same hardware address.
      c5c0a0e3
    • Herbert Xu's avatar
      [IPSEC]: Lock policy in policy timer. · e8d12276
      Herbert Xu authored
      e8d12276
    • Bartlomiej Zolnierkiewicz's avatar
      [PATCH] IDE PCI: don't initialize fields of static chipset tables to zero · 46f55c63
      Bartlomiej Zolnierkiewicz authored
      Also remove unused EOL define from ide.h.
      
      This trivial patch makes grepping a lot easier.
      46f55c63
    • Bartlomiej Zolnierkiewicz's avatar
      [PATCH] two fixups for my ARM/ARM26 IDE changes · 58148fac
      Bartlomiej Zolnierkiewicz authored
      - initializing needs to be set to 1 before calling ide_arm_init()
      
      - ide_default_io_ctl() should be 0 on arm26
      58148fac
    • Bartlomiej Zolnierkiewicz's avatar
      [PATCH] remove dead drivers/ide/ppc/swarm.c · cbc6f01b
      Bartlomiej Zolnierkiewicz authored
      This driver was partially merged in 2.5.32 and never compiled in 2.5/2.6.
      It was fixed in linux-mips CVS but has been broken again about 5 months ago.
      Just remove it for now (it is in wrong directory anyway).
      cbc6f01b
    • Adrian Bunk's avatar
      [PATCH] more comx removal · 6f9af6fc
      Adrian Bunk authored
      The patch below removes the MAINTAINERS entry for the removed comx
      driver.
      
      Additionally, the following comx header files could be removed:
        drivers/net/wan/mixcom.h
        drivers/net/wan/hscx.h
        drivers/net/wan/munich32x.h
        drivers/net/wan/falc-lh.h
      
      I've double-checked that none of them are used by any other driver.
      6f9af6fc
    • Adrian Bunk's avatar
      [PATCH] JFFS2_FS_NAND=y compile error · 8fcb7c33
      Adrian Bunk authored
      The case of CONFIG_JFFS2_FS_NAND=y got broken recently.
      
      The bug is obvious, and the fix is trivial:
      8fcb7c33
    • Andrew Morton's avatar
      [PATCH] autofs4: MAINTAINERS update · c56f34ad
      Andrew Morton authored
      From: Ian Kent <raven@themaw.net>
      
      This changes the autofs4 maintainer to me.  Recommended by Joe Perches and
      OKed with Jeremy.
      c56f34ad
    • Andrew Morton's avatar
      [PATCH] autofs4: printk cleanup · 2d9a3b29
      Andrew Morton authored
      From: Ian Kent <raven@themaw.net>
      
      This is a patch contributed by Joe Perches to automatically include the
      function name in the dprintk statements.
      2d9a3b29
    • Andrew Morton's avatar
      [PATCH] x86 cpuid cache info update · a7250728
      Andrew Morton authored
      From: Francois Romieu <romieu@fr.zoreil.com>
      
      Missing cache size format for Intel P4E (p.26 of doc.  241618-025, "Intel
      Processor Identification and the CPUID Instruction").
      a7250728
    • Andrew Morton's avatar
      [PATCH] i4l: Eicon driver: fix __devexit in prototype · dfbbadeb
      Andrew Morton authored
      From: Armin Schindler <armin@melware.de>
      
      Fixes a compiler warning about unused Eicon ISDN driver function if hotplug is
      disabled.
      dfbbadeb
    • Andrew Morton's avatar
      [PATCH] swsusp: fix devfs breakage introduced in 2.6.6 · 12186dc4
      Andrew Morton authored
      From: Pavel Machek <pavel@ucw.cz>
      
      This fixes bad interaction between devfs and swsusp.
      
      Check whether the swap device is the specified resume device, irrespective of
      whether they are specified by identical names.
      
      (Thus, device inode aliasing is allowed.  You can say /dev/hda4 instead of
      /dev/ide/host0/bus0/target0/lun0/part4 [if using devfs] and they'll be
      considered the same device.  This is *necessary* for devfs, since the resume
      code can only recognize the form /dev/hda4, but the suspend code would like
      the long name [as shown in 'cat /proc/mounts'].)
      
      [Thanks to devfs hero whose name I forgot.]
      12186dc4
    • Andrew Morton's avatar
      [PATCH] swsusp: kill unneccessary debugging · a7f8c55f
      Andrew Morton authored
      From: Pavel Machek <pavel@ucw.cz>
      
      This is no longer neccessary.  We have enough pauses elsewhere, and it works
      well enough that this is not needed.
      a7f8c55f
    • Andrew Morton's avatar
      [PATCH] blk: clear completion stack pointer on return · cb79a0b2
      Andrew Morton authored
      From: Jens Axboe <axboe@suse.de>
      
      It doesn't always look safe to let ->waiting remain set when returning from
      functions that set it to point to stack area, since various locations check
      for != NULL to see if it's valid.  So clear it on return from
      ide_do_drive_cmd() and blk_execute_rq().
      cb79a0b2
    • Andrew Morton's avatar
      [PATCH] Sanitise handling of unneeded syscall stubs · 581ae915
      Andrew Morton authored
      From: David Mosberger <davidm@napali.hpl.hp.com>
      
      Below is a patch that tries to sanitize the dropping of unneeded system-call
      stubs in generic code.  In some instances, it would be possible to move the
      optional system-call stubs into a library routine which would avoid the need
      for #ifdefs, but in many cases, doing so would require making several
      functions global (and possibly exporting additional data-structures in
      header-files).  Furthermore, it would inhibit (automatic) inlining in the
      cases in the cases where the stubs are needed.  For these reasons, the patch
      keeps the #ifdef-approach.
      
      This has been tested on ia64 and there were no objections from the
      arch-maintainers (and one positive response).  The patch should be safe but
      arch-maintainers may want to take a second look to see if some __ARCH_WANT_foo
      macros should be removed for their architecture (I'm quite sure that's the
      case, but I wanted to play it safe and only preserved the status-quo in that
      regard).
      581ae915
    • Andrew Morton's avatar
      [PATCH] trivial: remove duplicated #includes · 2b590e85
      Andrew Morton authored
      From: Rusty Russell <rusty@rustcorp.com.au>
      
      From:  a.othieno@bluewin.ch (Arthur Othieno)
      From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>
      
      Remove various duplicated #includes
      
      From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>
      
              Use mod_timer in drivers_block_floppy98.c
      
      From:  carbonated beverage <ramune@net-ronin.org>
      
              doc update for bk usage
              bk://... appears to be dead, use http://... instead.
      2b590e85
    • Andrew Morton's avatar
      [PATCH] trivial: use page_to_phys in dma_map_page() · f110f331
      Andrew Morton authored
      From: Trivial Patch Monkey <trivial@rustcorp.com.au>
      
      From:  Adam Lackorzynski <adam@os.inf.tu-dresden.de>
      
      dma_map_page() can be simplified by using page_to_phys instead of writing the
      calculation explicitly.
      f110f331
    • Andrew Morton's avatar
      [PATCH] fbdev: mode switching fix. · 458a5513
      Andrew Morton authored
      From: James Simmons <jsimmons@infradead.org>
      
      This fixes the bugs that where in mode switch via stty.
      
      The problem was we couldn't set the mode just by using the x and y
      resolution.  We use modedb to fill in the rest.  There also was a bug that
      allowed you to change the console resolution for drivers with fixed
      resolutions.  This would mess up your display.  Now that is fixed.
      458a5513
    • Andrew Morton's avatar
      [PATCH] fix sendfile on 64bit architectures · ef7df33c
      Andrew Morton authored
      From: Andi Kleen <ak@suse.de>
      
      sys_sendfile has a hardcoded 2GB limit.  64bit architectures should
      probably always use sys_sendfile64() in their native system tables, because
      for them sizeof(off_t) == sizeof(loff_t).  This patch does this.  It seemed
      easier to just change the 64bit entry tables instead of fixing up all the
      emulation layers to do 2GB checks on their own.
      
      I changed all 64bit architectures except for parisc64, which seemed to
      already have a sendfile64.
      ef7df33c
    • Andrew Morton's avatar
      [PATCH] console autodetection for pmac · 7c0e6555
      Andrew Morton authored
      From: Olaf Hering <olh@suse.de>
      
      This one allows console autodetection for powermacs.
      7c0e6555
    • Andrew Morton's avatar
      [PATCH] gss_api build fix · 9b19f4f0
      Andrew Morton authored
      From: "J. Bruce Fields" <bfields@fieldses.org>
      
      Older gcc's don't like that dimensionless array.  Remove it in favour of a
      pointer to the data.
      9b19f4f0
    • Andrew Morton's avatar
      [PATCH] vga16fb warning fix · f0ab7d06
      Andrew Morton authored
      drivers/video/vga16fb.c:1350: warning: assignment makes pointer from integer without a cast
      f0ab7d06
    • Andrew Morton's avatar
      [PATCH] Fix !CONFIG_SYSFS build · ab09753f
      Andrew Morton authored
      From: Maneesh Soni <maneesh@in.ibm.com>
      
      The sysfs_rename_dir() interface was changed recently but I forgot to
      change the definition if CONFIG_SYSFS is not defined.
      ab09753f
  2. 21 May, 2004 5 commits