20 Jul, 2007

2 commits

  • use vfs_path_lookup instead of open-coding the necessary functionality.

    Signed-off-by: Josef 'Jeff' Sipek
    Acked-by: Trond Myklebust
    Cc: Al Viro
    Acked-by: Christoph Hellwig
    Cc: Neil Brown
    Cc: Michael Halcrow
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Josef 'Jeff' Sipek
     
  • AFAICT now that jprobe.entry is a void *, JPROBE_ENTRY doesn't do anything
    useful - so remove it ..

    I've left a do-nothing version so that out-of-tree jprobes code will still
    compile without modifications.

    Signed-off-by: Michael Ellerman
    Cc: Prasanna S Panchamukhi
    Acked-by: Ananth N Mavinakayanahalli
    Cc: Anil S Keshavamurthy
    Cc: David S. Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Ellerman
     

19 Jul, 2007

2 commits

  • …/linville/wireless-2.6 into upstream

    Jeff Garzik
     
  • * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
    [NETFILTER]: xt_connlimit needs to depend on nf_conntrack
    [NETFILTER]: ipt_iprange.h must #include
    [IrDA]: Fix IrDA build failure
    [ATM]: nicstar needs virt_to_bus
    [NET]: move __dev_addr_discard adjacent to dev_addr_discard for readability
    [NET]: merge dev_unicast_discard and dev_mc_discard into one
    [NET]: move dev_mc_discard from dev_mcast.c to dev.c
    [NETLINK]: negative groups in netlink_setsockopt
    [PPPOL2TP]: Reset meta-data in xmit function
    [PPPOL2TP]: Fix use-after-free
    [PKT_SCHED]: Some typo fixes in net/sched/Kconfig
    [XFRM]: Fix crash introduced by struct dst_entry reordering
    [TCP]: remove unused argument to cong_avoid op
    [ATM]: [idt77252] Rename CONFIG_ATM_IDT77252_SEND_IDLE to not resemble a Kconfig variable
    [ATM]: [drivers] ioremap balanced with iounmap
    [ATM]: [lanai] sram_test_word() must be __devinit
    [ATM]: [nicstar] Replace C code with call to ARRAY_SIZE() macro.
    [ATM]: Eliminate dead config variable CONFIG_BR2684_FAST_TRANS.
    [ATM]: Replacing kmalloc/memset combination with kzalloc.
    [NET]: gen_estimator deadlock fix
    ...

    Linus Torvalds
     

18 Jul, 2007

21 commits

  • Rather than using a tri-state integer for the wait flag in
    call_usermodehelper_exec, define a proper enum, and use that. I've
    preserved the integer values so that any callers I've missed should
    still work OK.

    Signed-off-by: Jeremy Fitzhardinge
    Cc: James Bottomley
    Cc: Randy Dunlap
    Cc: Christoph Hellwig
    Cc: Andi Kleen
    Cc: Paul Mackerras
    Cc: Johannes Berg
    Cc: Ralf Baechle
    Cc: Bjorn Helgaas
    Cc: Joel Becker
    Cc: Tony Luck
    Cc: Kay Sievers
    Cc: Srivatsa Vaddagiri
    Cc: Oleg Nesterov
    Cc: David Howells

    Jeremy Fitzhardinge
     
  • Add a kstrndup function, modelled on strndup. Like strndup this
    returns a string copied into its own allocated memory, but it copies
    no more than the specified number of bytes from the source.

    Remove private strndup() from irda code.

    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Chris Wright
    Cc: Andrew Morton
    Cc: Randy Dunlap
    Cc: YOSHIFUJI Hideaki
    Cc: Akinobu Mita
    Cc: Arnaldo Carvalho de Melo
    Cc: Al Viro
    Cc: Panagiotis Issaris
    Cc: Rene Scharfe

    Jeremy Fitzhardinge
     
  • With NF_CONNTRACK=n, NETFILTER_XT_MATCH_CONNLIMIT=m I get the
    following errors on current git:

    CC [M] net/netfilter/xt_connlimit.o
    In file included from net/netfilter/xt_connlimit.c:27:
    include/net/netfilter/nf_conntrack.h:100: error: field 'ct_general' has incomplete type
    include/net/netfilter/nf_conntrack.h: In function 'nf_ct_get':
    include/net/netfilter/nf_conntrack.h:164: error: 'const struct sk_buff' has no member named 'nfct'
    include/net/netfilter/nf_conntrack.h: In function 'nf_ct_put':
    include/net/netfilter/nf_conntrack.h:171: warning: implicit declaration of function 'nf_conntrack_put'
    include/net/netfilter/nf_conntrack.h: In function 'nf_ct_is_untracked':
    include/net/netfilter/nf_conntrack.h:253: error: 'const struct sk_buff' has no member named 'nfct'
    In file included from net/netfilter/xt_connlimit.c:28:
    include/net/netfilter/nf_conntrack_core.h: In function 'nf_conntrack_confirm':
    include/net/netfilter/nf_conntrack_core.h:68: error: 'struct sk_buff' has no member named 'nfct'

    Adding a dependency in Kconfig fixes this.

    Signed-off-by: Cornelia Huck
    Signed-off-by: David S. Miller

    Cornelia Huck
     
  • When having built-in IrDA, we hit the following error:

    `irda_sysctl_unregister' referenced in section `.init.text' of
    net/built-in.o: defined in discarded section `.exit.text' of
    net/built-in.o
    `irda_proc_unregister' referenced in section `.init.text' of
    net/built-in.o: defined in discarded section `.exit.text' of
    net/built-in.o
    `irsock_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `irttp_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `iriap_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `irda_device_cleanup' referenced in section `.init.text' of
    net/built-in.o: defined in discarded section `.exit.text' of
    net/built-in.o
    `irlap_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    `irlmp_cleanup' referenced in section `.init.text' of net/built-in.o:
    defined in discarded section `.exit.text' of net/built-in.o
    make[1]: *** [.tmp_vmlinux1] Error 1
    make: *** [_all] Error 2

    This is due to the irda_init fix recently added, where we call __exit
    routines from an __init one. It is a build failure that I didn't catch
    because it doesn't show up when building IrDA as a module. My apologies
    for that.
    The following patch fixes that failure and is against your net-2.6
    tree. I hope it can make it to the merge window, and stable@kernel.org
    is CCed on this mail.

    Signed-off-by: Samuel Ortiz
    Signed-off-by: David S. Miller

    Samuel Ortiz
     
  • Signed-off-by: Denis Cheng
    Signed-off-by: David S. Miller

    Denis Cheng
     
  • this two functions could share the dev->_xmit_lock acquired context.

    Signed-off-by: Denis Cheng
    Signed-off-by: David S. Miller

    Denis Cheng
     
  • Because this function is only called by unregister_netdevice,
    this moving could make this non-global function static,
    and also remove its declaration in netdevice.h;

    Any further, function __dev_addr_discard is also just called by
    dev_mc_discard and dev_unicast_discard, keeping this two functions
    both in one c file could make __dev_addr_discard also static
    and remove its declaration in netdevice.h;

    Futhermore, the sequential call to dev_unicast_discard and then
    dev_mc_discard in unregister_netdevice have a similar mechanism that:
    (netif_tx_lock_bh / __dev_addr_discard / netif_tx_unlock_bh),
    they should merged into one to eliminate duplicates in acquiring and
    releasing the dev->_xmit_lock, this would be done in my following patch.

    Signed-off-by: Denis Cheng
    Signed-off-by: David S. Miller

    Denis Cheng
     
  • Reading netlink_setsockopt it's not immediately clear why there isn't a
    bug when you pass in negative numbers, the reason being that the >=
    comparison is really unsigned although 'val' is signed because
    nlk->ngroups is unsigned. Make 'val' unsigned too.

    [ Update the get_user() cast to match. --DaveM ]

    Signed-off-by: Johannes Berg
    Signed-off-by: David S. Miller

    Johannes Berg
     
  • Signed-off-by: Gabriel Craciunescu
    Signed-off-by: David S. Miller

    Gabriel Craciunescu
     
  • XFRM expects xfrm_dst->u.next to be same pointer as dst->next, which
    was broken by the dst_entry reordering in commit 1e19e02c~, causing
    an oops in xfrm_bundle_ok when walking the bundle upwards.

    Kill xfrm_dst->u.next and change the only user to use dst->next instead.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     
  • None of the existing TCP congestion controls use the rtt value pased
    in the ca_ops->cong_avoid interface. Which is lucky because seq_rtt
    could have been -1 when handling a duplicate ack.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: David S. Miller

    Stephen Hemminger
     
  • Signed-off-by: chas williams
    Signed-off-by: David S. Miller

    Robert P. J. Day
     
  • Signed-off-by: vignesh babu
    Signed-off-by: chas williams
    Signed-off-by: David S. Miller

    vignesh babu
     
  • -Fixes ABBA deadlock noted by Patrick McHardy :

    > There is at least one ABBA deadlock, est_timer() does:
    > read_lock(&est_lock)
    > spin_lock(e->stats_lock) (which is dev->queue_lock)
    >
    > and qdisc_destroy calls htb_destroy under dev->queue_lock, which
    > calls htb_destroy_class, then gen_kill_estimator and this
    > write_locks est_lock.

    To fix the ABBA deadlock the rate estimators are now kept on an rcu list.

    -The est_lock changes the use from protecting the list to protecting
    the update to the 'bstat' pointer in order to avoid NULL dereferencing.

    -The 'interval' member of the gen_estimator structure removed as it is
    not needed.

    Signed-off-by: Ranko Zivojnovic
    Signed-off-by: David S. Miller

    Ranko Zivojnovic
     
  • SoftMAC outputs the channel twice in the scan output. It should
    display frequency and channel, but only once for each.

    Signed-off-by: Jean Tourrilhes
    Signed-off-by: Larry Finger
    Signed-off-by: John W. Linville

    Jean Tourrilhes
     
  • We could return some sort of error in the case where someone asks for secinfo
    on an export without the secinfo= option set--that'd be no worse than what
    we've been doing. But it's not really correct. So, hack up an approximate
    secinfo response in that case--it may not be complete, but it'll tell the
    client at least one acceptable security flavor.

    Signed-off-by: "J. Bruce Fields"
    Signed-off-by: Neil Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    J. Bruce Fields
     
  • Adds oid values to the gss_api mechanism structures. On the NFSV4 server
    side, these are required as part of the security triple (oid,qop,service)
    information being sent in the response of the SECINFO operation.

    Signed-off-by: Usha Ketineni
    Signed-off-by: "J. Bruce Fields"
    Signed-off-by: Neil Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Usha Ketineni
     
  • We want it to be possible for users to restrict exports both by IP address and
    by pseudoflavor. The pseudoflavor information has previously been passed
    using special auth_domains stored in the rq_client field. After the preceding
    patch that stored the pseudoflavor in rq_pflavor, that's now superfluous; so
    now we use rq_client for the ip information, as auth_null and auth_unix do.

    However, we keep around the special auth_domain in the rq_gssclient field for
    backwards compatibility purposes, so we can still do upcalls using the old
    "gss/pseudoflavor" auth_domain if upcalls using the unix domain to give us an
    appropriate export. This allows us to continue supporting old mountd.

    In fact, for this first patch, we always use the "gss/pseudoflavor"
    auth_domain (and only it) if it is available; thus rq_client is ignored in the
    auth_gss case, and this patch on its own makes no change in behavior; that
    will be left to later patches.

    Note on idmap: I'm almost tempted to just replace the auth_domain in the idmap
    upcall by a dummy value--no version of idmapd has ever used it, and it's
    unlikely anyone really wants to perform idmapping differently depending on the
    where the client is (they may want to perform *credential* mapping
    differently, but that's a different matter--the idmapper just handles id's
    used in getattr and setattr). But I'm updating the idmapd code anyway, just
    out of general backwards-compatibility paranoia.

    Signed-off-by: "J. Bruce Fields"
    Signed-off-by: Neil Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    J. Bruce Fields
     
  • Add a new field to the svc_rqst structure to record the pseudoflavor that the
    request was made with. For now we record the pseudoflavor but don't use it
    for anything.

    Signed-off-by: Andy Adamson
    Signed-off-by: "J. Bruce Fields"
    Signed-off-by: Neil Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andy Adamson
     
  • Currently, the freezer treats all tasks as freezable, except for the kernel
    threads that explicitly set the PF_NOFREEZE flag for themselves. This
    approach is problematic, since it requires every kernel thread to either
    set PF_NOFREEZE explicitly, or call try_to_freeze(), even if it doesn't
    care for the freezing of tasks at all.

    It seems better to only require the kernel threads that want to or need to
    be frozen to use some freezer-related code and to remove any
    freezer-related code from the other (nonfreezable) kernel threads, which is
    done in this patch.

    The patch causes all kernel threads to be nonfreezable by default (ie. to
    have PF_NOFREEZE set by default) and introduces the set_freezable()
    function that should be called by the freezable kernel threads in order to
    unset PF_NOFREEZE. It also makes all of the currently freezable kernel
    threads call set_freezable(), so it shouldn't cause any (intentional)
    change of behaviour to appear. Additionally, it updates documentation to
    describe the freezing of tasks more accurately.

    [akpm@linux-foundation.org: build fixes]
    Signed-off-by: Rafael J. Wysocki
    Acked-by: Nigel Cunningham
    Cc: Pavel Machek
    Cc: Oleg Nesterov
    Cc: Gautham R Shenoy
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     
  • I can never remember what the function to register to receive VM pressure
    is called. I have to trace down from __alloc_pages() to find it.

    It's called "set_shrinker()", and it needs Your Help.

    1) Don't hide struct shrinker. It contains no magic.
    2) Don't allocate "struct shrinker". It's not helpful.
    3) Call them "register_shrinker" and "unregister_shrinker".
    4) Call the function "shrink" not "shrinker".
    5) Reduce the 17 lines of waffly comments to 13, but document it properly.

    Signed-off-by: Rusty Russell
    Cc: David Chinner
    Cc: Trond Myklebust
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rusty Russell
     

17 Jul, 2007

6 commits

  • * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
    forcedeth bug fix: realtek phy
    forcedeth bug fix: vitesse phy
    forcedeth bug fix: cicada phy
    atl1: reorder atl1_main functions
    atl1: fix excessively indented code
    atl1: cleanup atl1_main
    atl1: header file cleanup
    atl1: remove irq_sem
    cdc-subset to support new vendor/product ID
    8139cp: implement the missing dev->tx_timeout
    myri10ge: Remove nonsensical limit in the tx done routine
    gianfar: kill unused header
    EP93XX_ETH must select MII
    macb: Add multicast capability
    macb: Use generic PHY layer
    s390: add barriers to qeth driver
    s390: scatter-gather for inbound traffic in qeth driver
    eHEA: Introducing support vor DLPAR memory add
    Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
    [PATCH] softmac: Fix ESSID problem
    ...

    Linus Torvalds
     
  • …/linville/wireless-2.6 into upstream

    Jeff Garzik
     
  • This reverts commit 29578624e354f56143d92510fff33a8b2aaa2c03.

    Ingo Molnar reports complete breakage with his e1000 card (no
    networking, card reports transmit timeouts), and bisected it down to
    this commit. Let's figure out what went wrong, but not keep breaking
    machines until we do.

    Cc: Ingo Molnar
    Cc: Olaf Kirch
    Cc: David Miller
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Add TTY input auditing, used to audit system administrator's actions. This is
    required by various security standards such as DCID 6/3 and PCI to provide
    non-repudiation of administrator's actions and to allow a review of past
    actions if the administrator seems to overstep their duties or if the system
    becomes misconfigured for unknown reasons. These requirements do not make it
    necessary to audit TTY output as well.

    Compared to an user-space keylogger, this approach records TTY input using the
    audit subsystem, correlated with other audit events, and it is completely
    transparent to the user-space application (e.g. the console ioctls still
    work).

    TTY input auditing works on a higher level than auditing all system calls
    within the session, which would produce an overwhelming amount of mostly
    useless audit events.

    Add an "audit_tty" attribute, inherited across fork (). Data read from TTYs
    by process with the attribute is sent to the audit subsystem by the kernel.
    The audit netlink interface is extended to allow modifying the audit_tty
    attribute, and to allow sending explanatory audit events from user-space (for
    example, a shell might send an event containing the final command, after the
    interactive command-line editing and history expansion is performed, which
    might be difficult to decipher from the TTY input alone).

    Because the "audit_tty" attribute is inherited across fork (), it would be set
    e.g. for sshd restarted within an audited session. To prevent this, the
    audit_tty attribute is cleared when a process with no open TTY file
    descriptors (e.g. after daemon startup) opens a TTY.

    See https://www.redhat.com/archives/linux-audit/2007-June/msg00000.html for a
    more detailed rationale document for an older version of this patch.

    [akpm@linux-foundation.org: build fix]
    Signed-off-by: Miloslav Trmac
    Cc: Al Viro
    Cc: Alan Cox
    Cc: Paul Fulghum
    Cc: Casey Schaufler
    Cc: Steve Grubb
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Miloslav Trmac
     
  • Part two in the O_CLOEXEC saga: adding support for file descriptors received
    through Unix domain sockets.

    The patch is once again pretty minimal, it introduces a new flag for recvmsg
    and passes it just like the existing MSG_CMSG_COMPAT flag. I think this bit
    is not used otherwise but the networking people will know better.

    This new flag is not recognized by recvfrom and recv. These functions cannot
    be used for that purpose and the asymmetry this introduces is not worse than
    the already existing MSG_CMSG_COMPAT situations.

    The patch must be applied on the patch which introduced O_CLOEXEC. It has to
    remove static from the new get_unused_fd_flags function but since scm.c cannot
    live in a module the function still hasn't to be exported.

    Here's a test program to make sure the code works. It's so much longer than
    the actual patch...

    #include
    #include
    #include
    #include
    #include
    #include
    #include
    #include

    #ifndef O_CLOEXEC
    # define O_CLOEXEC 02000000
    #endif
    #ifndef MSG_CMSG_CLOEXEC
    # define MSG_CMSG_CLOEXEC 0x40000000
    #endif

    int
    main (int argc, char *argv[])
    {
    if (argc > 1)
    {
    int fd = atol (argv[1]);
    printf ("child: fd = %d\n", fd);
    if (fcntl (fd, F_GETFD) == 0 || errno != EBADF)
    {
    puts ("file descriptor valid in child");
    return 1;
    }
    return 0;

    }

    struct sockaddr_un sun;
    strcpy (sun.sun_path, "./testsocket");
    sun.sun_family = AF_UNIX;

    char databuf[] = "hello";
    struct iovec iov[1];
    iov[0].iov_base = databuf;
    iov[0].iov_len = sizeof (databuf);

    union
    {
    struct cmsghdr hdr;
    char bytes[CMSG_SPACE (sizeof (int))];
    } buf;
    struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 1,
    .msg_control = buf.bytes,
    .msg_controllen = sizeof (buf) };
    struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);

    cmsg->cmsg_level = SOL_SOCKET;
    cmsg->cmsg_type = SCM_RIGHTS;
    cmsg->cmsg_len = CMSG_LEN (sizeof (int));

    msg.msg_controllen = cmsg->cmsg_len;

    pid_t child = fork ();
    if (child == -1)
    error (1, errno, "fork");
    if (child == 0)
    {
    int sock = socket (PF_UNIX, SOCK_STREAM, 0);
    if (sock < 0)
    error (1, errno, "socket");

    if (bind (sock, (struct sockaddr *) &sun, sizeof (sun)) < 0)
    error (1, errno, "bind");
    if (listen (sock, SOMAXCONN) < 0)
    error (1, errno, "listen");

    int conn = accept (sock, NULL, NULL);
    if (conn == -1)
    error (1, errno, "accept");

    *(int *) CMSG_DATA (cmsg) = sock;
    if (sendmsg (conn, &msg, MSG_NOSIGNAL) < 0)
    error (1, errno, "sendmsg");

    return 0;
    }

    /* For a test suite this should be more robust like a
    barrier in shared memory. */
    sleep (1);

    int sock = socket (PF_UNIX, SOCK_STREAM, 0);
    if (sock < 0)
    error (1, errno, "socket");

    if (connect (sock, (struct sockaddr *) &sun, sizeof (sun)) < 0)
    error (1, errno, "connect");
    unlink (sun.sun_path);

    *(int *) CMSG_DATA (cmsg) = -1;

    if (recvmsg (sock, &msg, MSG_CMSG_CLOEXEC) < 0)
    error (1, errno, "recvmsg");

    int fd = *(int *) CMSG_DATA (cmsg);
    if (fd == -1)
    error (1, 0, "no descriptor received");

    char fdname[20];
    snprintf (fdname, sizeof (fdname), "%d", fd);
    execl ("/proc/self/exe", argv[0], fdname, NULL);
    puts ("execl failed");
    return 1;
    }

    [akpm@linux-foundation.org: Fix fastcall inconsistency noted by Michael Buesch]
    [akpm@linux-foundation.org: build fix]
    Signed-off-by: Ulrich Drepper
    Cc: Ingo Molnar
    Cc: Michael Buesch
    Cc: Michael Kerrisk
    Acked-by: David S. Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ulrich Drepper
     
  • Recent breakage..

    net/sunrpc/auth_gss/auth_gss.c:1002: warning: implicit declaration of function 'lock_kernel'
    net/sunrpc/auth_gss/auth_gss.c:1004: warning: implicit declaration of function 'unlock_kernel'

    Cc: Trond Myklebust
    Cc: "J. Bruce Fields"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     

16 Jul, 2007

3 commits

  • * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
    [TCP]: Verify the presence of RETRANS bit when leaving FRTO
    [IPV6]: Call inet6addr_chain notifiers on link down
    [NET_SCHED]: Kill CONFIG_NET_CLS_POLICE
    [NET_SCHED]: act_api: qdisc internal reclassify support
    [NET_SCHED]: sch_dsmark: act_api support
    [NET_SCHED]: sch_atm: act_api support
    [NET_SCHED]: sch_atm: Lindent
    [IPV6]: MSG_ERRQUEUE messages do not pass to connected raw sockets
    [IPV4]: Cleanup call to __neigh_lookup()
    [NET_SCHED]: Revert "avoid transmit softirq on watchdog wakeup" optimization
    [NETFILTER]: nf_conntrack: UDPLITE support
    [NETFILTER]: nf_conntrack: mark protocols __read_mostly
    [NETFILTER]: x_tables: add connlimit match
    [NETFILTER]: Lower *tables printk severity
    [NETFILTER]: nf_conntrack: Don't track locally generated special ICMP error
    [NETFILTER]: nf_conntrack: Introduces nf_ct_get_tuplepr and uses it
    [NETFILTER]: nf_conntrack: make l3proto->prepare() generic and renames it
    [NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header
    [NET]: Add ethtool support for NETIF_F_IPV6_CSUM devices.
    [AF_IUCV]: Add lock when updating accept_q
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
    9p: fix a race condition bug in umount which caused a segfault
    9p: re-enable mount time debug option
    9p: cache meta-data when cache=loose
    net/9p: set error to EREMOTEIO if trans->write returns zero
    net/9p: change net/9p module name to 9pnet
    9p: Reorganization of 9p file system code

    Linus Torvalds
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     

15 Jul, 2007

6 commits

  • For yet unknown reason, something cleared SACKED_RETRANS bit
    underneath FRTO.

    Signed-off-by: Ilpo Järvinen
    Signed-off-by: David S. Miller

    Ilpo Järvinen
     
  • Currently if the link is brought down via ip link or ifconfig down,
    the inet6addr_chain notifiers are not called even though all
    the addresses are removed from the interface. This caused SCTP
    to add duplicate addresses to it's list.

    Signed-off-by: Vlad Yasevich
    Signed-off-by: David S. Miller

    Vlad Yasevich
     
  • The NET_CLS_ACT option is now a full replacement for NET_CLS_POLICE,
    remove the old code. The config option will be kept around to select
    the equivalent NET_CLS_ACT options for a short time to allow easier
    upgrades.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     
  • The behaviour of NET_CLS_POLICE for TC_POLICE_RECLASSIFY was to return
    it to the qdisc, which could handle it internally or ignore it. With
    NET_CLS_ACT however, tc_classify starts over at the first classifier
    and never returns it to the qdisc. This makes it impossible to support
    qdisc-internal reclassification, which in turn makes it impossible to
    remove the old NET_CLS_POLICE code without breaking compatibility since
    we have two qdiscs (CBQ and ATM) that support this.

    This patch adds a tc_classify_compat function that handles
    reclassification the old way and changes CBQ and ATM to use it.

    This again is of course not fully backwards compatible with the previous
    NET_CLS_ACT behaviour. Unfortunately there is no way to fully maintain
    compatibility *and* support qdisc internal reclassification with
    NET_CLS_ACT, but this seems like the better choice over keeping the two
    incompatible options around forever.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     
  • Handle act_api classification results.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     
  • Handle act_api classification results.

    The ATM scheduler behaves slightly different than other schedulers
    in that it only handles policer results for successful classifications,
    this behaviour is retained for the act_api case.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy