[LV-k25-commit] Linux for the VAX architecture: Changes to 'master'

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

 arch/sparc/kernel/entry.S       |    3 -
 arch/sparc/kernel/systbls.S     |    5 +-
 arch/sparc64/kernel/entry.S     |    3 -
 arch/sparc64/kernel/systbls.S   |    8 ++-
 drivers/net/tg3.c               |    8 +--
 include/asm-sparc/unistd.h      |    9 ++--
 include/asm-sparc64/unistd.h    |   10 +++-
 include/linux/ipx.h             |   14 +++---
 include/net/inet_ecn.h          |    2 
 include/net/ipx.h               |   26 ++++++------
 net/Kconfig                     |    3 -
 net/core/pktgen.c               |   30 ++++++++------
 net/core/sock.c                 |    2 
 net/ipv6/ndisc.c                |    1 
 net/ipv6/sit.c                  |    1 
 net/ipx/af_ipx.c                |   85 +++++++++++++++++++++-------------------
 net/ipx/ipx_proc.c              |   12 ++---
 net/ipx/ipx_route.c             |   14 +++---
 net/netfilter/nfnetlink_log.c   |    8 +--
 net/netfilter/nfnetlink_queue.c |    2 
 net/netlabel/Kconfig            |    2 
 21 files changed, 135 insertions(+), 113 deletions(-)

New commits:
commit d1ed6a3ea10aa7b199c434f6ffd1b6761896567a
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1ed6a3ea10aa7b199c434f6ffd1b6761896567a
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1ed6a3ea10aa7b199c434f6ffd1b6761896567a
Merge: 59359ff87700f5e742c96a55da9cf0819984c128 38c94377a36f70e86665231c9f477e445c806618
Author: Linus Torvalds <tor...@g5...>
Date:   Sun Nov 5 19:10:04 2006 -0800

    Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
    
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [NETLABEL]: Fix build failure.
      [IPV6]: Give sit driver an appropriate module alias.
      [IPV6]: Add ndisc_netdev_notifier unregister.
      [NET]: __alloc_pages() failures reported due to fragmentation
      [PKTGEN]: TCI endianness fixes
      [TG3]: Fix 2nd ifup failure on 5752M.
      [NETFILTER] bug: skb->protocol is already net-endian
      [NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit
      [NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit
      [IPV6]: Fix ECN bug on big-endian
      [IPX]: Annotate and fix IPX checksum
      [IPX]: Trivial parts of endianness annotations

commit 59359ff87700f5e742c96a55da9cf0819984c128
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=59359ff87700f5e742c96a55da9cf0819984c128
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=59359ff87700f5e742c96a55da9cf0819984c128
Author: David S. Miller <da...@da...>
Date:   Sun Nov 5 16:51:03 2006 -0800

    [SPARC]: Fix robust futex syscalls and wire up migrate_pages.
    
    When I added the entries for the robust futex syscall entries, I
    forgot to bump NR_SYSCALLS.  The current situation is error-prone
    because NR_SYSCALLS lives in entry.S where the system call limit
    checks are enforced.  Move the definition to asm/unistd.h in order to
    make this mistake much more difficult to make.
    
    And wire up sys_migrate_pages since the powerpc folks implemented the
    compat wrapper for us.
    
    Signed-off-by: David S. Miller <da...@da...>

commit 38c94377a36f70e86665231c9f477e445c806618
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=38c94377a36f70e86665231c9f477e445c806618
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=38c94377a36f70e86665231c9f477e445c806618
Author: Paul Moore <pau...@hp...>
Date:   Sun Nov 5 16:44:06 2006 -0800

    [NETLABEL]: Fix build failure.
    
    > the build with the attached .config failed, make ends with:
    > ...
    > : undefined reference to `cipso_v4_sock_getattr'
    > net/built-in.o: In function `netlbl_socket_getattr':
    
     ...
    
    It looks like I was stupid and made NetLabel depend on CONFIG_NET and not
    CONFIG_INET, the patch below should fix this by making NetLabel depend on
    CONFIG_INET and CONFIG_SECURITY.  Please review and apply for 2.6.19.
    
    Signed-off-by: Paul Moore <pau...@hp...>
    Signed-off-by: David S. Miller <da...@da...>

commit daccff024ffeb21caa2cc479ccc33b2ec50705b1
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=daccff024ffeb21caa2cc479ccc33b2ec50705b1
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=daccff024ffeb21caa2cc479ccc33b2ec50705b1
Author: Patrick McHardy <ka...@tr...>
Date:   Sun Nov 5 15:47:04 2006 -0800

    [IPV6]: Give sit driver an appropriate module alias.
    
    It would be nice to keep things working even with this built as a
    module, it took me some time to realize my IPv6 tunnel was broken
    because of the missing sit module. This module alias fixes things
    until distributions have added an appropriate alias to modprobe.conf.
    
    Signed-off-by: Patrick McHardy <ka...@tr...>
    Signed-off-by: David S. Miller <da...@da...>

commit 36f73d0c3b7efa72cd8b89f2d429ff39bc12f15c
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=36f73d0c3b7efa72cd8b89f2d429ff39bc12f15c
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=36f73d0c3b7efa72cd8b89f2d429ff39bc12f15c
Author: Dmitry Mishin <di...@op...>
Date:   Fri Nov 3 16:08:19 2006 -0800

    [IPV6]: Add ndisc_netdev_notifier unregister.
    
    If inet6_init() fails later than ndisc_init() call, or IPv6 module is
    unloaded, ndisc_netdev_notifier call remains in the list and will follows in
    oops later.
    
    Signed-off-by: Dmitry Mishin <di...@op...>
    Signed-off-by: David S. Miller <da...@da...>

commit db38c179a759a9c4722525e8c9f09ac80e372377
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=db38c179a759a9c4722525e8c9f09ac80e372377
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=db38c179a759a9c4722525e8c9f09ac80e372377
Author: Larry Woodman <lwo...@re...>
Date:   Fri Nov 3 16:05:45 2006 -0800

    [NET]: __alloc_pages() failures reported due to fragmentation
    
    We have seen a couple of __alloc_pages() failures due to
    fragmentation, there is plenty of free memory but no large order pages
    available.  I think the problem is in sock_alloc_send_pskb(), the
    gfp_mask includes __GFP_REPEAT but its never used/passed to the page
    allocator.  Shouldnt the gfp_mask be passed to alloc_skb() ?
    
    Signed-off-by: Larry Woodman <lwo...@re...>
    Signed-off-by: David S. Miller <da...@da...>

commit 0f37c6057414fb68024793966b1dcb6a135cb844
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0f37c6057414fb68024793966b1dcb6a135cb844
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0f37c6057414fb68024793966b1dcb6a135cb844
Author: Al Viro <vi...@ze...>
Date:   Fri Nov 3 03:49:56 2006 -0800

    [PKTGEN]: TCI endianness fixes
    
    open-coded variant there works only for little-endian
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>

commit 36da4d869f23bc7d1a70a3185218cb626537845c
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=36da4d869f23bc7d1a70a3185218cb626537845c
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=36da4d869f23bc7d1a70a3185218cb626537845c
Author: Michael Chan <mc...@br...>
Date:   Fri Nov 3 01:01:03 2006 -0800

    [TG3]: Fix 2nd ifup failure on 5752M.
    
    This fixes a bug reported in:
    
    http://bugzilla.kernel.org/show_bug.cgi?id=7438
    
    tg3_close() turns off the PHY if WoL and ASF are both disabled.  On
    the next tg3_open(), some devices such as the 5752M will not be
    brought up correctly without a PHY reset early in the reset sequence.
    The PHY clock is needed for some internal MAC blocks to function
    correctly.
    
    This problem is fixed by always resetting the PHY early in
    tg3_reset_hw() when it is called from tg3_open() or tg3_resume().
    tg3_setup_phy() can then be called later in the sequence without the
    reset_phy parameter set to 1, since the PHY reset is already done.
    
    Update version to 3.68.
    
    Signed-off-by: Michael Chan <mc...@br...>
    Signed-off-by: David S. Miller <da...@da...>

commit febf0a431e42f5a1fdb2b763273700610552ddcc
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=febf0a431e42f5a1fdb2b763273700610552ddcc
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=febf0a431e42f5a1fdb2b763273700610552ddcc
Author: Al Viro <vi...@ze...>
Date:   Fri Nov 3 00:59:17 2006 -0800

    [NETFILTER] bug: skb->protocol is already net-endian
    
    htons() is not needed (and no, it's not misspelled ntohs() -
    userland expects net-endian here).
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>

commit d1208b999dd367b72168cc3c7f8d8d2c95143c67
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1208b999dd367b72168cc3c7f8d8d2c95143c67
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1208b999dd367b72168cc3c7f8d8d2c95143c67
Author: Al Viro <vi...@ze...>
Date:   Fri Nov 3 00:58:41 2006 -0800

    [NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>

commit 7ac00a24f379f8ab9d3c968fea3dc030a45956fd
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7ac00a24f379f8ab9d3c968fea3dc030a45956fd
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7ac00a24f379f8ab9d3c968fea3dc030a45956fd
Author: Al Viro <vi...@ze...>
Date:   Fri Nov 3 00:58:17 2006 -0800

    [NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>

commit 95026cd242bd4188a036f2eba20994113ed5a5d7
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=95026cd242bd4188a036f2eba20994113ed5a5d7
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=95026cd242bd4188a036f2eba20994113ed5a5d7
Author: Al Viro <vi...@ze...>
Date:   Fri Nov 3 00:55:35 2006 -0800

    [IPV6]: Fix ECN bug on big-endian
    
    __constant_htons(2<<4) is not a replacement for
    htonl(2<<20).
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>

commit 02e60370d4dac83f22d5ae75d5512bcb9a3f24b7
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=02e60370d4dac83f22d5ae75d5512bcb9a3f24b7
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=02e60370d4dac83f22d5ae75d5512bcb9a3f24b7
Author: Al Viro <vi...@ze...>
Date:   Fri Nov 3 00:28:23 2006 -0800

    [IPX]: Annotate and fix IPX checksum
    
    Calculation of IPX checksum got buggered about 2.4.0.  The old variant
    mangled the packet; that got fixed, but calculation itself got buggered.
    Restored the correct logics, fixed a subtle breakage we used to have even
    back then: if the sum is 0 mod 0xffff, we want to return 0, not 0xffff.
    The latter has special meaning for IPX (cheksum disabled).  Observation
    (and obvious fix) nicked from history of FreeBSD ipx_cksum.c...
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>

commit 4833ed094097323f5f219820f6ebdc8dd66f501f
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4833ed094097323f5f219820f6ebdc8dd66f501f
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4833ed094097323f5f219820f6ebdc8dd66f501f
Author: Al Viro <vi...@ze...>
Date:   Fri Nov 3 00:27:06 2006 -0800

    [IPX]: Trivial parts of endianness annotations
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>