1. 25 May, 2007 14 commits
    • Tony Breeds's avatar
      Fix build failure for drivers/ata/pata_scc.c · 7e068376
      Tony Breeds authored
      The commit d4b2bab4 added deadline support
      to prereset and reset methods to libbata the pata_scc driver wasn't
      converted.  This patch is a naive attempt to bring this driver up to
      scratch.
      
      Build failures are:
      drivers/ata/pata_scc.c: In function 'scc_pata_prereset':
      drivers/ata/pata_scc.c:870: error: too few arguments to function 'ata_std_prereset'
      drivers/ata/pata_scc.c: In function 'scc_error_handler':
      drivers/ata/pata_scc.c:916: warning: passing argument 2 of 'ata_bmdma_drive_eh' from incompatible pointer type
      drivers/ata/pata_scc.c:916: warning: passing argument 3 of 'ata_bmdma_drive_eh' from incompatible pointer type
      drivers/ata/pata_scc.c: In function 'scc_pata_prereset':
      drivers/ata/pata_scc.c:871: warning: control reaches end of non-void function
      
      On a releated note scc_bus_post_reset() is (AFACT) identical to
      ata_bus_post_reset(), would a patch to make ata_bus_post_reset() assesable
      to drivers be accepted?
      Signed-off-by: default avatarTony Breeds <tony@bakeyournoodle.com>
      Acked-by: default avatarTejun Heo <htejun@gmail.com>
      Cc: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      7e068376
    • Jeff Garzik's avatar
      [libata] sata_mv: add TODO list · 4a05e209
      Jeff Garzik authored
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      4a05e209
    • Jeff Garzik's avatar
      [libata] sata_promise: fix flags typo · bb312235
      Jeff Garzik authored
      A stray comma makes all the difference.  Change to '|' as these flags
      should be or'd together.
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      bb312235
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 1c1ee4c3
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
        [XFRM]: Allow packet drops during larval state resolution.
        [CASSINI]: Check pci_set_mwi() return value.
        [NET]: "wrong timeout value" in sk_wait_data() v2
        [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook
        [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA
        [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal
        [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access
        [NETFILTER]: nf_conntrack_h323: fix ASN.1 types
        [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation
        [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update
        [NET_SCHED]: sch_htb: fix event cache time calculation
        [DCCP]: Fix build warning when debugging is disabled.
        [TIPC]: Fixed erroneous introduction of for_each_netdev
        [RTNETLINK]: Fix sending netlink message when replace route.
        [TR]: Use menuconfig objects.
        [ARCNET]: Use menuconfig objects.
        [TIPC]: Use menuconfig objects.
        [SCTP]: Use menuconfig objects.
        [IPVS]: Use menuconfig objects.
        [DCCP]: Use menuconfig objects.
        ...
      1c1ee4c3
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 91396c1e
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_via: Handle laptops via DMI
        libata: -ENODEV during prereset isn't an error
        libata: don't consider 0xff as port empty if SStatus is available
        ata_piix: add short 40c quirk for Acer Aspire 2030, take #2
        pata_sis: Fix and clean up some timing setups
        hpt3x2n: Correct revision boundary
      91396c1e
    • David S. Miller's avatar
      [XFRM]: Allow packet drops during larval state resolution. · 14e50e57
      David S. Miller authored
      The current IPSEC rule resolution behavior we have does not work for a
      lot of people, even though technically it's an improvement from the
      -EAGAIN buisness we had before.
      
      Right now we'll block until the key manager resolves the route.  That
      works for simple cases, but many folks would rather packets get
      silently dropped until the key manager resolves the IPSEC rules.
      
      We can't tell these folks to "set the socket non-blocking" because
      they don't have control over the non-block setting of things like the
      sockets used to resolve DNS deep inside of the resolver libraries in
      libc.
      
      With that in mind I coded up the patch below with some help from
      Herbert Xu which provides packet-drop behavior during larval state
      resolution, controllable via sysctl and off by default.
      
      This lays the framework to either:
      
      1) Make this default at some point or...
      
      2) Move this logic into xfrm{4,6}_policy.c and implement the
         ARP-like resolution queue we've all been dreaming of.
         The idea would be to queue packets to the policy, then
         once the larval state is resolved by the key manager we
         re-resolve the route and push the packets out.  The
         packets would timeout if the rule didn't get resolved
         in a certain amount of time.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      14e50e57
    • David S. Miller's avatar
      04efb878
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 9059b454
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] acpi_get_sysname() should be __init
        [IA64] Cleanup acpi header to reuse the generic _PDC defines
        [IA64] Fix using uninitialized data in _PDC setup
        [IA64] start_secondary() and smp_callin() should be __cpuinit
      9059b454
    • Alan Cox's avatar
      pata_via: Handle laptops via DMI · cf5792d2
      Alan Cox authored
      Oh the joy of saving a fraction of a cent using short 40 wire cables and
      not faking 80wire
      
      Teach the VIA driver that there are some systems we need to know are
      magically wired for high speeds.
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Tested-by: default avatarFrancis Russell <FrancisRussell@btinternet.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      cf5792d2
    • Tejun Heo's avatar
      libata: -ENODEV during prereset isn't an error · 6dffaf61
      Tejun Heo authored
      During prereset, -ENODEV return from ata_wait_ready() is not an error.
      This causes unnecessary bug message on controllers which uses 0xff to
      indicate empty port.  Fix it.
      Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      6dffaf61
    • Tejun Heo's avatar
      libata: don't consider 0xff as port empty if SStatus is available · fd7fe701
      Tejun Heo authored
      Some SATA controllers (sata_sil) use 0xff to indicate port not ready
      status, not port empty.  As libata interprets 0xff as port empty, this
      causes unnecessary reset failure and retry.  Don't consider 0xff as
      port empty if SStatus is available and indicates that port is online.
      Signed-off-by: default avatartejun Heo <htejun@gmail.com>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Cc: Indan Zupancic <indan@nul.nu>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      fd7fe701
    • Tejun Heo's avatar
      ata_piix: add short 40c quirk for Acer Aspire 2030, take #2 · b33620f9
      Tejun Heo authored
      Acer Aspire 2023WLMi uses short 40c cable.  Add quirk for it.
      Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
      Cc: Steve H. <mail.pandor@gmail.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      b33620f9
    • Alan Cox's avatar
      pata_sis: Fix and clean up some timing setups · dd668d15
      Alan Cox authored
      - Rename sis_port_base to sis_old_port_base() so nobody uses it for new
      generation controllers in error.
      - Use byte size operations where it is cleaner for mode setup
      - Fix a couple of masking errors on certai chip revs when setting speeds
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      dd668d15
    • Alan Cox's avatar
      hpt3x2n: Correct revision boundary · 824cf333
      Alan Cox authored
      We have a revision that isn't correctly claimed as two drivers both go
      for it: Fix the test accordingly. Noticed originally by Bill Nottingham.
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      824cf333
  2. 24 May, 2007 26 commits