1. 06 Aug, 2008 6 commits
    • Linus Torvalds's avatar
      Re-introduce "[SCSI] extend the last_sector_bug flag to cover more sectors" · 18351070
      Linus Torvalds authored
      This re-introduces commit 2b142900,
      which was reverted due to the regression it caused by commit
      fca082c9.
      
      That regression was not root-caused by the original commit, it was just
      uncovered by it, and the real fix was done by Alan Stern in commit
      580da348 ("Fix USB storage hang on
      command abort").
      
      We can thus re-introduce the change that was confirmed by Alan Jenkins
      to be still required by his odd card reader.
      
      Cc: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      18351070
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · e63e0327
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits)
        AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
        pktgen: mac count
        pktgen: random flow 
        bridge: Eliminate unnecessary forward delay
        bridge: fix compile warning in net/bridge/br_netfilter.c
        ipv4: remove unused field in struct flowi (include/net/flow.h).
        tg3: Fix 'scheduling while atomic' errors
        net: Kill plain NET_XMIT_BYPASS.
        net_sched: Add qdisc __NET_XMIT_BYPASS flag
        net_sched: Add qdisc __NET_XMIT_STOLEN flag
        iwl3945: fix merge mistake for packet injection
        iwlwifi: grap nic access before accessing periphery registers
        iwlwifi: decrement rx skb counter in scan abort handler
        iwlwifi: fix unhandled interrupt when HW rfkill is on
        iwlwifi: implement iwl5000_calc_rssi
        iwlwifi: memory allocation optimization
        iwlwifi: HW bug fixes
        p54: Fix potential concurrent access to private data
        rt2x00: Disable link tuning in rt2500usb
        iwlwifi: Don't use buffer allocated on the stack for led names
        ...
      e63e0327
    • Ralf Baechle's avatar
      AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE · ffb20847
      Ralf Baechle authored
      Since 49ffcf8f ("sysctl: update
      sysctl_check_table") setting struct ctl_table.procname = NULL does no
      longer work as it used to the way the AX.25 code is expecting it to
      resulting in the AX.25 sysctl registration code to break if
      CONFIG_AX25_DAMA_SLAVE was not set as in some distribution kernels.
      Kernel releases from 2.6.24 are affected.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ffb20847
    • Robert Olsson's avatar
      pktgen: mac count · ff2a79a5
      Robert Olsson authored
      dst_mac_count and src_mac_count patch from Eneas Hunguana
      We have sent one mac address to much.
      Signed-off-by: default avatarRobert Olsson <robert.olsson@its.uu.se>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ff2a79a5
    • Robert Olsson's avatar
      pktgen: random flow · 1211a645
      Robert Olsson authored
      Random flow generation has not worked. This fixes it.
      Signed-off-by: default avatarRobert Olsson <robert.olsson@its.uu.se>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1211a645
    • Stephen Hemminger's avatar
      bridge: Eliminate unnecessary forward delay · ef647f13
      Stephen Hemminger authored
      From: Stephen Hemminger <shemminger@vyatta.com>
      
      Based upon original patch by Herbert Xu, which contained
      the following problem description:
      
      --------------------
      When the forward delay is set to zero, we still delay the setting
      of the forwarding state by one or possibly two timers depending
      on whether STP is enabled.  This could either turn out to be
      instantaneous, or horribly slow depending on the load of the
      machine.
      
      As there is nothing preventing us from enabling forwarding straight
      away, this patch eliminates this potential delay by executing the
      code directly if the forward delay is zero.
      
      The effect of this problem is that immediately after the carrier
      comes on a port, the bridge will drop all packets received from
      that port until it enters forwarding mode, thus causing unnecessary
      packet loss.
      
      Note that this patch doesn't fully remove the delay due to the
      link watcher.  We should also check the carrier state when we
      are about to drop an incoming packet because the port is disabled.
      But that's for another patch.
      --------------------
      
      This version of the fix takes a different approach, in that
      it just does the state change directly.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ef647f13
  2. 05 Aug, 2008 34 commits