1. 09 11月, 2013 4 次提交
    • F
      ipv6: enable IPV6_FLOWLABEL_MGR for getsockopt · 3fdfa5ff
      Florent Fourcot 提交于
      It is already possible to set/put/renew a label
      with IPV6_FLOWLABEL_MGR and setsockopt. This patch
      add the possibility to get information about this
      label (current value, time before expiration, etc).
      
      It helps application to take decision for a renew
      or a release of the label.
      
      v2:
       * Add spin_lock to prevent race condition
       * return -ENOENT if no result found
       * check if flr_action is GET
      
      v3:
       * move the spin_lock to protect only the
         relevant code
      Signed-off-by: NFlorent Fourcot <florent.fourcot@enst-bretagne.fr>
      Acked-by: NHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3fdfa5ff
    • E
      net: flow_dissector: small optimizations in IPv4 dissect · 3797d3e8
      Eric Dumazet 提交于
      By moving code around, we avoid :
      
      1) A reload of iph->ihl (bit field, so needs a mask)
      
      2) A conditional test (replaced by a conditional mov on x86)
         Fast path loads iph->protocol anyway.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3797d3e8
    • B
      netdev: smc91x: enable for xtensa · cdc4ead0
      Baruch Siach 提交于
      Tested in VLAB Works Xtensa simulation.
      Signed-off-by: NBaruch Siach <baruch@tkos.co.il>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cdc4ead0
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 74ecd3d1
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      Here is one more pull request for the 3.13 window.  This is primarily
      composed of downstream pull requests that were posted while I was
      traveling during the last part of the 3.12 release.
      
      For the mac80211 bits, Johannes says:
      
      "I have two DFS fixes (ath9k already supports DFS) and a fix for a
      pointer race."
      
      And...
      
      "In this round for mac80211-next I have:
       * mesh channel switch support
       * a CCM rewrite, using potential hardware offloads
       * SMPS for AP mode
       * RF-kill GPIO driver updates to make it usable as an ACPI driver
       * regulatory improvements
       * documentation fixes
       * DFS for IBSS mode
       * and a few small other fixes/improvements"
      
      For the TI driver bits, Luca says:
      
      "Some patches intended for 3.13.  Eliad continues upstreaming pending
      patches from the internal tree."
      
      For the iwlwifi bits, Emmanuel says:
      
      "There are a few fixes from Johannes mostly clean up patches. We have
      also a few other fixes that are relevant for the new firmware that has
      not been released yet."
      
      For the Bluetooth bits, Gustavo says:
      
      "A last fix to the 3.12. I ended forgetting to send it before, I hope we can
      still make the way to 3.12. It is a revert and it fixes an issue with bluetooth
      suspend/hibernate that had many bug reports. Please pull or let me know of any
      problems. Thanks!"  (Obviously, that one didn't make 3.12...)
      
      Also...
      
      "One more big pull request for 3.13. These are the patches we queued during
      last week. Here you will find a lot of improvements to the HCI and L2CAP and
      MGMT layers with the main ones being a better debugfs support and end of work
      of splitting L2CAP into Core and Socket parts."
      
      Additionally, there is one ath9k patch to enable DFS in IBSS mode for
      that driver.
      
      I appreciate your consideration for taking this extra pull request
      this cycle.  Please let me know if there are problems!
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      74ecd3d1
  2. 08 11月, 2013 34 次提交
  3. 07 11月, 2013 2 次提交