1. 27 1月, 2007 14 次提交
  2. 26 1月, 2007 1 次提交
  3. 25 1月, 2007 13 次提交
  4. 24 1月, 2007 12 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 6f3776c9
      Linus Torvalds 提交于
      * 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.
        ...
      6f3776c9
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 6e35c24b
      Linus Torvalds 提交于
      * '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
      6e35c24b
    • J
      Merge branch 'master' into upstream-fixes · e47b207a
      Jeff Garzik 提交于
      e47b207a
    • B
      libata: Initialize qc->pad_len · d0f29485
      Brian King 提交于
      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: NBrian King <brking@linux.vnet.ibm.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      d0f29485
    • B
      libata: Fixup n_elem initialization · 7a801184
      Brian King 提交于
      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: NBrian King <brking@linux.vnet.ibm.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      7a801184
    • T
      ahci: don't enter slumber on power down · 07c53dac
      Tejun Heo 提交于
      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: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      07c53dac
    • R
      sata_nv: don't rely on NV_INT_DEV indication with ADMA · f740d168
      Robert Hancock 提交于
      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: NRobert Hancock <hancockr@shaw.ca>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      f740d168
    • T
      ahci: make ULi M5288 ignore interface fatal error bit · 82490c09
      Tejun Heo 提交于
      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: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      82490c09
    • B
      [SCTP]: Fix compiler warning. · 1e5c11fc
      Brian Haley 提交于
      > --- 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: NBrian Haley <brian.haley@hp.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1e5c11fc
    • M
      [IP] TUNNEL: Fix to be built with user application. · 6fd8bb88
      Masahide NAKAMURA 提交于
      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: NMasahide NAKAMURA <nakam@linux-ipv6.org>
      Signed-off-by: NTAKAMIYA Noriaki <takamiya@po.ntts.co.jp>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6fd8bb88
    • N
      [IPV6]: Fixed the size of the netlink message notified by inet6_rt_notify(). · 6a2b9ce0
      Noriaki TAKAMIYA 提交于
      I think the return value of rt6_nlmsg_size() should includes the
      amount of RTA_METRICS.
      Signed-off-by: NNoriaki TAKAMIYA <takamiya@po.ntts.co.jp>
      Acked-by: NThomas Graf <tgraf@suug.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6a2b9ce0
    • J
      [TCP]: rare bad TCP checksum with 2.6.19 · 52d570aa
      Jarek Poplawski 提交于
      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: NJarek Poplawski <jarkao2@o2.pl>
      Acked-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      52d570aa