Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 25, 2007
  1. Linux 2.6.20-rc6

    Linus Torvalds authored
Commits on Jan 24, 2007
  1. Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    Linus Torvalds authored
    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Fix wrong checksum calculation on 64-bit MIPS
      [MIPS] VPE loader: Initialize lists before they're actually being used ...
      [MIPS] Fix reported amount of freed memory - it's in kB not bytes
      [MIPS] vr41xx: need one more nop with mtc0_tlbw_hazard()
      [MIPS] SMTC: Fix module build by exporting symbol
      [MIPS] SMTC: Fix TLB sizing bug for TLB of 64 >= entries
      [MIPS] Fix APM build
      [MIPS] There is no __GNUC_MAJOR__
  2. [PATCH] NFS: Fix races in nfs_revalidate_mapping()

    Trond Myklebust authored Linus Torvalds committed
    Prevent the call to invalidate_inode_pages2() from racing with file writes
    by taking the inode->i_mutex across the page cache flush and invalidate.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. [PATCH] NFS: Fix Oops in rpc_call_sync()

    Trond Myklebust authored Linus Torvalds committed
    Fix the Oops in http://bugzilla.linux-nfs.org/show_bug.cgi?id=138
    We shouldn't be calling rpc_release_task() for tasks that are not active.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @ralfbaechle

    [MIPS] Fix wrong checksum calculation on 64-bit MIPS

    Atsushi Nemoto authored ralfbaechle committed
    The commit 8e3d843 ([NET]: MIPS
    checksum annotations and cleanups) broke 64-bit MIPS.
    
    The problem is the commit replaces some unsigned long with __be32.  On
    64bit MIPS, a __be32 (i.e. unsigned int) value is represented as a
    sign-extented 32-bit value in a 64-bit argument register.  So the
    address 192.168.0.1 (0xc0a80001) is passed as 0xffffffffc0a80001 to
    csum_tcpudp_nofold() but the asm code in the function expects
    0x00000000c0a80001, therefore it returns a wrong checksum.  Explicit
    cast to unsigned long is needed to drop high 32bit.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  5. @ralfbaechle

    [MIPS] VPE loader: Initialize lists before they're actually being use…

    ralfbaechle authored
    …d ...
    
    kspd which due to makefile order happens to be initialized before the
    vpe loader causes references to vpecontrol lists before they're actually
    been initialized.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  6. @ralfbaechle

    [MIPS] Fix reported amount of freed memory - it's in kB not bytes

    Thiemo Seufer authored ralfbaechle committed
    While at it, change message on DEC for consistency.
    
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  7. @ralfbaechle

    [MIPS] vr41xx: need one more nop with mtc0_tlbw_hazard()

    Yoichi Yuasa authored ralfbaechle committed
    NEC VR4111 and VR4121 need one more nop with mtc0_tlbw_hazard().
    
    Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  8. @ralfbaechle

    [MIPS] SMTC: Fix module build by exporting symbol

    ralfbaechle authored
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  9. @ralfbaechle

    [MIPS] SMTC: Fix TLB sizing bug for TLB of 64 >= entries

    ralfbaechle authored
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  10. @ralfbaechle

    [MIPS] Fix APM build

    ralfbaechle authored
    Definitions for TIF_FREEZE and _TIF_FREEZE were missing.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  11. @ralfbaechle

    [MIPS] There is no __GNUC_MAJOR__

    Alexey Dobriyan authored ralfbaechle committed
    Gcc major version number is in __GNUC__. As side effect fix checking
    with sparse if sparse was built with gcc 4.1 and mips cross-compiler
    is 3.4.
    
    Sparse will inherit version 4.1, __GNUC__ won't be filtered from
    "-dM -E -xc" output, sparse will pick only new major, effectively becoming
    gcc version 3.1 which is unsupported.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  12. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] Fix oops when Windows server sent bad domain name null terminator
      [CIFS]  cifs sprintf fix
      [CIFS] Remove 2 unneeded kzalloc casts
      [CIFS] Update CIFS version number
  13. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)
      [SCTP]: Fix compiler warning.
      [IP] TUNNEL: Fix to be built with user application.
      [IPV6]: Fixed the size of the netlink message notified by inet6_rt_notify().
      [TCP]: rare bad TCP checksum with 2.6.19
      [NET]: Process include/linux/if_{addr,link}.h with unifdef
      [NETFILTER]: Fix iptables ABI breakage on (at least) CRIS
      [IRDA] vlsi_ir.{h,c}: remove kernel 2.4 code
      [TCP]: skb is unexpectedly freed.
      [IPSEC]: Policy list disorder
      [IrDA]: Removed incorrect IRDA_ASSERT()
      [IrDA]: irda-usb TX path optimization (was Re: IrDA spams logfiles - since 2.6.19)
      [X.25]: Add missing sock_put in x25_receive_data
      [SCTP]: Fix SACK sequence during shutdown
      [SCTP]: Correctly handle unexpected INIT-ACK chunk.
      [SCTP]: Verify some mandatory parameters.
      [SCTP]: Set correct error cause value for missing parameters
      [NETFILTER]: fix xt_state compile failure
      [NETFILTER]: ctnetlink: fix leak in ctnetlink_create_conntrack error path
      [SELINUX]: increment flow cache genid
      [IPV6] MCAST: Fix joining all-node multicast group on device initialization.
      ...
  14. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds authored
    …nel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      mv643xx_eth: Fix race condition in mv643xx_eth_free_tx_descs
      s2io bogus memset
  15. Merge branch 'master' into upstream-fixes

    Jeff Garzik authored
  16. libata: Initialize qc->pad_len

    Brian King authored Jeff Garzik committed
    Initialize qc->pad_len for each new command. This ensures
    that pad_len is not set to a stale value for zero data
    length commands.
    
    Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  17. libata: Fixup n_elem initialization

    Brian King authored Jeff Garzik committed
    Fixup the inialization of qc->n_elem. It currently gets
    initialized to 1 for commands that do not transfer any data.
    Fix this by initializing n_elem to 0 and only setting to 1
    in ata_scsi_qc_new when there is data to transfer. This fixes
    some problems seen with SATA devices attached to ipr adapters.
    
    Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  18. @htejun

    ahci: don't enter slumber on power down

    htejun authored Jeff Garzik committed
    Some ATA/ATAPI devices act weirdly after the link is put into slumber
    mode.  Some hang completely requiring physical power removal while
    others fail to wake up till the link is hardreset a couple of times.
    
    The addition of slumber on power down was never driven by real need.
    It just followed what ahci spec said literally.  The spec itself seems
    faulty in that it doesn't consider devices (not controllers) which
    don't support link powersaving mode.
    
    Theory never matches reality when it comes to dark allys of cheap
    ATA/ATAPI world.  It's just unrealistic to expect vendors to test
    rarely used link powersaving feature rigorously.  This patch makes
    ahci more friendly to the coldness of reality.
    
    This shouldn't have any negative effect - when suspend operation
    succeeds, we power off the whole machine; otherwise, we wake up
    everything.  I can't see any reason to be so elaborate with powering
    down the link in the first place.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  19. sata_nv: don't rely on NV_INT_DEV indication with ADMA

    Robert Hancock authored Jeff Garzik committed
    Several people reported issues with certain drive commands timing out on
    sata_nv controllers running in ADMA mode. The commands in question were
    non-DMA-mapped commands, usually FLUSH CACHE or FLUSH CACHE EXT.
    
     From experimentation it appears that the NV_INT_DEV indication isn't
    always set when a legitimate command completion interrupt is received on
    a legacy-mode command, at least not on these controllers in ADMA mode.
    When a command is pending on the port, force the flag on always in the
    irq_stat value before calling nv_host_intr so that the drive busy state
    is always checked by ata_host_intr.
    
    This also fixes some questionable code in nv_host_intr which called
    ata_check_status when a command was pending and ata_host_intr returned
    "unhandled". If the device interrupted at just the wrong time this could
    cause interrupts to be lost.
    
    Signed-off-by: Robert Hancock <hancockr@shaw.ca>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  20. @htejun

    ahci: make ULi M5288 ignore interface fatal error bit

    htejun authored Jeff Garzik committed
    As with JMicron controllers, ULi M5288 sets interface fatal error bit
    on device error including ATAPI CC.  This makes libata hardreset the
    port on ATAPI CC thus making it impossible to use.  Ignore interface
    fatal error bit on ULi M5288.  This fixes bugzilla bug #7837.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  21. @brianphaley @davem330

    [SCTP]: Fix compiler warning.

    brianphaley authored davem330 committed
    > --- a/net/sctp/sm_statefuns.c
    > +++ b/net/sctp/sm_statefuns.c
    > @@ -462,24 +461,6 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(const struct sctp_endpoint *ep,
    
    > -	if (!init_tag) {
    > -		struct sctp_chunk *reply = sctp_make_abort(asoc, chunk, 0);
    > -		if (!reply)
    > -			goto nomem;
    
    This introduced a compiler warning, easily fixed.
    
    Signed-off-by: Brian Haley <brian.haley@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  22. @davem330

    [IP] TUNNEL: Fix to be built with user application.

    Masahide NAKAMURA authored davem330 committed
    include/linux/if_tunnel.h is broken for user application
    because it was changed to use __be32 which is required
    to include linux/types.h in advance but didn't.
    
    (This issue is found when building MIPL2 daemon. We are not sure this
    is the last header to be fixed about __be32.)
    
    Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
    Signed-off-by: TAKAMIYA Noriaki <takamiya@po.ntts.co.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  23. @davem330

    [IPV6]: Fixed the size of the netlink message notified by inet6_rt_no…

    Noriaki TAKAMIYA authored davem330 committed
    …tify().
    
    I think the return value of rt6_nlmsg_size() should includes the
    amount of RTA_METRICS.
    
    Signed-off-by: Noriaki TAKAMIYA <takamiya@po.ntts.co.jp>
    Acked-by: Thomas Graf <tgraf@suug.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  24. @davem330

    [TCP]: rare bad TCP checksum with 2.6.19

    Jarek Poplawski authored davem330 committed
    The patch "Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE"
    changed to unconditional copying of ip_summed field from collapsed
    skb. This patch reverts this change.
    
    The majority of substantial work including heavy testing
    and diagnosing by: Michael Tokarev <mjt@tls.msk.ru>
    Possible reasons pointed by: Herbert Xu and Patrick McHardy.
    
    Signed-off-by: Jarek Poplawski <jarkao2@o2.pl>
    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  25. @AdrianBunk @davem330

    [NET]: Process include/linux/if_{addr,link}.h with unifdef

    AdrianBunk authored davem330 committed
    After commit d3dcc07, 
    include/linux/if_{addr,link}.h should be processed with unifdef.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  26. @kaber @davem330

    [NETFILTER]: Fix iptables ABI breakage on (at least) CRIS

    kaber authored davem330 committed
    With the introduction of x_tables we accidentally broke compatibility
    by defining IPT_TABLE_MAXNAMELEN to XT_FUNCTION_MAXNAMELEN instead of
    XT_TABLE_MAXNAMELEN, which is two bytes larger.
    
    On most architectures it doesn't really matter since we don't have
    any tables with names that long in the kernel and the structure
    layout didn't change because of alignment requirements of following
    members. On CRIS however (and other architectures that don't align
    data) this changed the structure layout and thus broke compatibility
    with old iptables binaries.
    
    Changing it back will break compatibility with binaries compiled
    against recent kernels again, but since the breakage has only been
    there for three releases this seems like the better choice.
    
    Spotted by Jonas Berlin <xkr47@outerspace.dyndns.org>.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  27. @AdrianBunk @davem330

    [IRDA] vlsi_ir.{h,c}: remove kernel 2.4 code

    AdrianBunk authored davem330 committed
    This patch removes kernel 2.4 compatibility code.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Acked-by: Samuel Ortiz <samuel@sortiz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  28. [TCP]: skb is unexpectedly freed.

    Masayuki Nakagawa authored David S. Miller committed
    I encountered a kernel panic with my test program, which is a very
    simple IPv6 client-server program.
    
    The server side sets IPV6_RECVPKTINFO on a listening socket, and the
    client side just sends a message to the server.  Then the kernel panic
    occurs on the server.  (If you need the test program, please let me
    know. I can provide it.)
    
    This problem happens because a skb is forcibly freed in
    tcp_rcv_state_process().
    
    When a socket in listening state(TCP_LISTEN) receives a syn packet,
    then tcp_v6_conn_request() will be called from
    tcp_rcv_state_process().  If the tcp_v6_conn_request() successfully
    returns, the skb would be discarded by __kfree_skb().
    
    However, in case of a listening socket which was already set
    IPV6_RECVPKTINFO, an address of the skb will be stored in
    treq->pktopts and a ref count of the skb will be incremented in
    tcp_v6_conn_request().  But, even if the skb is still in use, the skb
    will be freed.  Then someone still using the freed skb will cause the
    kernel panic.
    
    I suggest to use kfree_skb() instead of __kfree_skb().
    
    Signed-off-by: Masayuki Nakagawa <nakagawa.msy@ncos.nec.co.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  29. @herbertx

    [IPSEC]: Policy list disorder

    herbertx authored David S. Miller committed
    The recent hashing introduced an off-by-one bug in policy list insertion.
    Instead of adding after the last entry with a lesser or equal priority,
    we're adding after the successor of that entry.
    
    This patch fixes this and also adds a warning if we detect a duplicate
    entry in the policy list.  This should never happen due to this if clause.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  30. @sameo

    [IrDA]: Removed incorrect IRDA_ASSERT()

    sameo authored David S. Miller committed
    With USB2.0 bulk out MTU can be 512 bytes, so checking it only for 64
    bytes is incorrect.
    
    Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  31. @sameo

    [IrDA]: irda-usb TX path optimization (was Re: IrDA spams logfiles - …

    sameo authored David S. Miller committed
    …since 2.6.19)
    
    Since we stop using dev_alloc_skb on the IrDA TX frame, we constantly run
    into the case of the skb headroom being 0, and thus we call skb_cow for
    every IrDA TX frame.
    This patch uses a local buffer and memcpy the skb to it, saving us a
    kmalloc for each of those IrDA TX frames.
    
    Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  32. @AndrewHendry

    [X.25]: Add missing sock_put in x25_receive_data

    AndrewHendry authored David S. Miller committed
    __x25_find_socket does a sock_hold.
    This adds a missing sock_put in x25_receive_data.
    
    Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  33. [SCTP]: Fix SACK sequence during shutdown

    Vlad Yasevich authored David S. Miller committed
    Currently, when association enters SHUTDOWN state,the
    implementation will SACK any DATA first and then transmit
    the SHUTDOWN chunk.  This is against the order required by
    2960bis spec.  SHUTDOWN must always be first, followed by
    SACK. This change forces this order and also enables bundling.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Something went wrong with that request. Please try again.