1. 20 3月, 2012 2 次提交
    • J
      ixgbe: fix namespace issues when FCoE/DCB is not enabled · 8af3c33f
      Jeff Kirsher 提交于
      Resolve namespace issues when FCoE or DCB is not enabled.
      The issue is with certain configurations we end up with namespace
      problems. A simple example:
      
      ixgbe_main.c
       - defines func A()
       - uses func A()
      
      ixgbe_fcoe.c
       - uses func A()
      
      ixgbe.h
       - has prototype for func A()
      
      For default (FCoE included) all is good.  But when it isn't the namespace
      checker complains about how func A() could be static.
      
      To resolve this, created a ixgbe_lib file to contain functions used
      by DCB/FCoE and their helper functions so that they are always in
      namespace whether or not DCB/FCoE is enabled.
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Tested-by: NPhil Schmitt <phillip.j.schmitt@intel.com>
      8af3c33f
    • A
      ixgbe: Correct flag values set by ixgbe_fix_features · 567d2de2
      Alexander Duyck 提交于
      This patch replaces the variable name data with the variable name features
      for ixgbe_fix_features and ixgbe_set_features.  This helps to make some
      issues more obvious such as the fact that we were disabling Rx VLAN tag
      stripping when we should have been forcing it to be enabled when DCB is
      enabled.
      
      In addition there was deprecated code present that was disabling the LRO
      flag if we had the itr value set too low.  I have updated this logic so
      that we will now allow the LRO flag to be set, but will not enable RSC
      until the rx-usecs value is high enough to allow enough time for Rx packet
      coalescing.
      Signed-off-by: NAlexander Duyck <alexander.h.duyck@intel.com>
      Tested-by: NStephen Ko <stephen.s.ko@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      567d2de2
  2. 19 3月, 2012 11 次提交
  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 25 次提交