1. 21 3月, 2012 24 次提交
  2. 19 3月, 2012 2 次提交
  3. 18 3月, 2012 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c579bc7e
      Linus Torvalds 提交于
      Pull networking changes from David Miller:
       "1) icmp6_dst_alloc() returns NULL instead of ERR_PTR() leading to
           crashes, particularly during shutdown.  Reported by Dave Jones and
           fixed by Eric Dumazet.
      
        2) hyperv and wimax/i2400m return NETDEV_TX_BUSY when they have
           already freed the SKB, which causes crashes as to the caller this
           means requeue the packet.  Fixes from Eric Dumazet.
      
        3) usbnet driver doesn't allocate the right amount of headroom on
           fresh RX SKBs, fix from Eric Dumazet.
      
        4) Fix regression in ip6_mc_find_dev_rcu(), as an RCU lookup it
           abolutely should not take a reference to 'dev', this leads to
           leaks.  Fix from RonQing Li.
      
        5) Fix netfilter ctnetlink race between delete and timeout expiration.
           From Pablo Neira Ayuso.
      
        6) Revert SFQ change which causes regressions, specifically queueing
           to tail can lead to unavoidable flow starvation.  From Eric
           Dumazet.
      
        7) Fix a memory leak and a crash on corrupt firmware files in bnx2x,
           from Michal Schmidt."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        netfilter: ctnetlink: fix race between delete and timeout expiration
        ipv6: Don't dev_hold(dev) in ip6_mc_find_dev_rcu.
        wimax/i2400m: fix erroneous NETDEV_TX_BUSY use
        net/hyperv: fix erroneous NETDEV_TX_BUSY use
        net/usbnet: reserve headroom on rx skbs
        bnx2x: fix memory leak in bnx2x_init_firmware()
        bnx2x: fix a crash on corrupt firmware file
        sch_sfq: revert dont put new flow at the end of flows
        ipv6: fix icmp6_dst_alloc()
      c579bc7e
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 96ee0499
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools, x86: Build perf on older user-space as well
        perf tools: Use scnprintf where applicable
        perf tools: Incorrect use of snprintf results in SEGV
      96ee0499
  4. 17 3月, 2012 9 次提交
  5. 16 3月, 2012 3 次提交
    • M
      C6X: remove dead code from entry.S · 6e780cf5
      Mark Salter 提交于
      The ENDPROC() on sys_fadvise64_c6x() in arch/c6x/kernel/entry.S is
      outside of the conditional block with the matching ENTRY() macro. This
      leads a newer (v2.22 vs. v2.20) assembler to complain:
      
        /tmp/ccGZBaPT.s: Assembler messages:
        /tmp/ccGZBaPT.s: Error: .size expression for sys_fadvise64_c6x does not evaluate to a constant
      
      The conditional block became dead code when c6x switched to generic
      unistd.h and should be removed along with the offending ENDPROC().
      Signed-off-by: NMark Salter <msalter@redhat.com>
      Acked-by: NDavid Howells <dhowells@redhat.com>
      6e780cf5
    • E
      wimax/i2400m: fix erroneous NETDEV_TX_BUSY use · b8fbaef5
      Eric Dumazet 提交于
      A driver start_xmit() method cannot free skb and return NETDEV_TX_BUSY,
      since caller is going to reuse freed skb.
      
      In fact netif_tx_stop_queue() / netif_stop_queue() is needed before
      returning NETDEV_TX_BUSY or you can trigger a ksoftirqd fatal loop.
      
      In case of memory allocation error, only safe way is to drop the packet
      and return NETDEV_TX_OK
      
      Also increments tx_dropped counter
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b8fbaef5
    • E
      net/hyperv: fix erroneous NETDEV_TX_BUSY use · bb6d5e76
      Eric Dumazet 提交于
      A driver start_xmit() method cannot free skb and return NETDEV_TX_BUSY,
      since caller is going to reuse freed skb.
      
      This is mostly a revert of commit bf769375 (staging: hv: fix the return
      status of netvsc_start_xmit())
      
      In fact netif_tx_stop_queue() / netif_stop_queue() is needed before
      returning NETDEV_TX_BUSY or you can trigger a ksoftirqd fatal loop.
      
      In case of memory allocation error, only safe way is to drop the packet
      and return NETDEV_TX_OK
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Cc: "K. Y. Srinivasan" <kys@microsoft.com>
      Cc: Haiyang Zhang <haiyangz@microsoft.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Reviewed-by: NHaiyang Zhang <haiyangz@microsoft.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bb6d5e76