1. 21 3月, 2006 8 次提交
    • Y
    • Y
      [IPV6]: ADDRCONF: Use our standard algorithm for randomized ifid. · 955189ef
      YOSHIFUJI Hideaki 提交于
      RFC 3041 describes an algorithm to generate random interface
      identifier.  In RFC 3041bis, it is allowed to use different
      algorithm than one described in RFC 3041.
      
      So, let's use our standard pseudo random algorithm to simplify
      our implementation.
      Signed-off-by: NYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      955189ef
    • Y
    • Y
      [IPV6]: TUNNEL6: Don't try to add multicast route twice. · 74a3a0ed
      YOSHIFUJI Hideaki 提交于
      Since addrconf_add_dev() has already called addrconf_add_mroute()
      to added route for multicast prefix, there's no point to call it
      again in addrconf_ip6_tnl_config().
      Signed-off-by: NYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      74a3a0ed
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · c4a1745a
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (230 commits)
        [SPARC64]: Update defconfig.
        [SPARC64]: Fix 2 bugs in huge page support.
        [SPARC64]: CONFIG_BLK_DEV_RAM fix
        [SPARC64]: Optimized TSB table initialization.
        [SPARC64]: Allow CONFIG_MEMORY_HOTPLUG to build.
        [SPARC64]: Use SLAB caches for TSB tables.
        [SPARC64]: Don't kill the page allocator when growing a TSB.
        [SPARC64]: Randomize mm->mmap_base when PF_RANDOMIZE is set.
        [SPARC64]: Increase top of 32-bit process stack.
        [SPARC64]: Top-down address space allocation for 32-bit tasks.
        [SPARC64] bbc_i2c: Fix cpu check and add missing module license.
        [SPARC64]: Fix and re-enable dynamic TSB sizing.
        [SUNSU]: Fix missing spinlock initialization.
        [TG3]: Do not try to access NIC_SRAM_DATA_SIG on Sun parts.
        [SPARC64]: First cut at VIS simulator for Niagara.
        [SPARC64]: Fix system type in /proc/cpuinfo and remove bogus OBP check.
        [SPARC64]: Add SMT scheduling support for Niagara.
        [SPARC64]: Fix 32-bit truncation which broke sparsemem.
        [SPARC64]: Move over to sparsemem.
        [SPARC64]: Fix new context version SMP handling.
        ...
      c4a1745a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 · 88dcb911
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
        JFS: add uid, gid, and umask mount options
        JFS: Take logsync lock before testing mp->lsn
        JFS: kzalloc conversion
        JFS: Add missing file from fa3241d2
        JFS: Use the kthread_ API
        JFS: Fix regression.  fsck complains if symlinks do not have INLINEEA attribute
        JFS: ext2 inode attributes for jfs
        JFS: semaphore to mutex conversion.
        JFS: make buddy table static
        JFS: Add back directory i_size calculations for legacy partitions
      88dcb911
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · c7cace64
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (150 commits)
        [PATCH] ipw2100: Update version ipw2100 stamp to 1.2.2
        [PATCH] ipw2100: move mutex.h include from ipw2100.c to ipw2100.h
        [PATCH] ipw2100: semaphore to mutexes conversion
        [PATCH] ipw2100: Fix radiotap code gcc warning
        [PATCH] ipw2100: add radiotap headers to packtes captured in monitor mode
        [PATCH] ipw2x00: expend Copyright to 2006
        [PATCH] drivers/net/wireless/ipw2200.c: fix an array overun
        [PATCH] ieee80211: Don't update network statistics from off-channel packets.
        [PATCH] ipw2200: Update ipw2200 version stamp to 1.1.1
        [PATCH] ipw2200: switch to the new ipw2200-fw-3.0 image format
        [PATCH] ipw2200: wireless extension sensitivity threshold support
        [PATCH] ipw2200: Enables the "slow diversity" algorithm
        [PATCH] ipw2200: Set a meaningful silence threshold value
        [PATCH] ipw2200: export `debug' module param only if CONFIG_IPW2200_DEBUG
        [PATCH] ipw2200: Change debug level for firmware error logging
        [PATCH] ipw2200: Filter unsupported channels out in ad-hoc mode
        [PATCH] ipw2200: Fix ipw_sw_reset() implementation inconsistent with comment
        [PATCH] ipw2200: Fix rf_kill is activated after mode change with 'disable=1'
        [PATCH] ipw2200: remove the WPA card associates to non-WPA AP checking
        [PATCH] ipw2200: Add signal level to iwlist scan output
        ...
      c7cace64
    • L
      Merge branch 'block-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/block · a90779bf
      Linus Torvalds 提交于
      * 'block-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/block:
        [PATCH] fix rmmod problems with elevator attributes, clean them up
        [PATCH] elevator_t lifetime rules and sysfs fixes
        [PATCH] noise removal: cfq-iosched.c
        [PATCH] don't bother with refcounting for cfq_data
        [PATCH] fix sysfs interaction and lifetime rules handling for queues
        [PATCH] regularize blk_cleanup_queue() use
        [PATCH] fix cfq_get_queue()/ioprio_set(2) races
        [PATCH] deal with rmmod/put_io_context() races
        [PATCH] stop elv_unregister() from rogering other iosched's data, fix locking
        [PATCH] stop cfq from pinning queue down
        [PATCH] make cfq_exit_queue() prune the cfq_io_context for that queue
        [PATCH] fix the exclusion for ioprio_set()
        [PATCH] keep sync and async cfq_queue separate
        [PATCH] switch to use of ->key to get cfq_data by cfq_io_context
        [PATCH] stop leaking cfq_data in cfq_set_request()
        [PATCH] fix cfq hash lookups
        [PATCH] fix locking in queue_requests_store()
        [PATCH] fix double-free in blk_init_queue_node()
        [PATCH] don't do exit_io_context() until we know we won't be doing any IO
      a90779bf
  2. 20 3月, 2006 32 次提交