1. 20 7月, 2007 6 次提交
  2. 19 7月, 2007 22 次提交
  3. 18 7月, 2007 12 次提交
    • J
      usermodehelper: Tidy up waiting · 86313c48
      Jeremy Fitzhardinge 提交于
      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: NJeremy Fitzhardinge <jeremy@xensource.com>
      Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Andi Kleen <ak@suse.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Johannes Berg <johannes@sipsolutions.net>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
      Cc: Joel Becker <joel.becker@oracle.com>
      Cc: Tony Luck <tony.luck@intel.com>
      Cc: Kay Sievers <kay.sievers@vrfy.org>
      Cc: Srivatsa Vaddagiri <vatsa@in.ibm.com>
      Cc: Oleg Nesterov <oleg@tv-sign.ru>
      Cc: David Howells <dhowells@redhat.com>
      86313c48
    • J
      add kstrndup · 1e66df3e
      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: NJeremy Fitzhardinge <jeremy@xensource.com>
      Signed-off-by: NChris Wright <chrisw@sous-sol.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Cc: Akinobu Mita <akinobu.mita@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@mandriva.com>
      Cc: Al Viro <viro@ftp.linux.org.uk>
      Cc: Panagiotis Issaris <takis@issaris.org>
      Cc: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
      1e66df3e
    • C
      [NETFILTER]: xt_connlimit needs to depend on nf_conntrack · 3fd8f9e4
      Cornelia Huck 提交于
      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: NCornelia Huck <cornelia.huck@de.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3fd8f9e4
    • S
      [IrDA]: Fix IrDA build failure · 75a69ac6
      Samuel Ortiz 提交于
      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: NSamuel Ortiz <samuel@sortiz.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      75a69ac6
    • D
    • D
      [NET]: merge dev_unicast_discard and dev_mc_discard into one · 26cc2522
      Denis Cheng 提交于
      this two functions could share the dev->_xmit_lock acquired context.
      Signed-off-by: NDenis Cheng <crquan@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      26cc2522
    • D
      [NET]: move dev_mc_discard from dev_mcast.c to dev.c · 456ad75c
      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: NDenis Cheng <crquan@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      456ad75c
    • J
      [NETLINK]: negative groups in netlink_setsockopt · eb496534
      Johannes Berg 提交于
      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: NJohannes Berg <johannes@sipsolutions.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      eb496534
    • G
    • P
      [XFRM]: Fix crash introduced by struct dst_entry reordering · bd0bf076
      Patrick McHardy 提交于
      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: NPatrick McHardy <kaber@trash.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bd0bf076
    • S
      [TCP]: remove unused argument to cong_avoid op · 16751347
      Stephen Hemminger 提交于
      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: NStephen Hemminger <shemminger@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      16751347
    • R