1. 05 Feb, 2015 31 commits
  2. 04 Feb, 2015 9 commits
    • David S. Miller's avatar
      Merge tag 'mac80211-next-for-davem-2015-02-03' of... · 940288b6
      David S. Miller authored
      Merge tag 'mac80211-next-for-davem-2015-02-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
      
      
      
      Last round of updates for net-next:
       * revert a patch that caused a regression with mesh userspace (Bob)
       * fix a number of suspend/resume related races
         (from Emmanuel, Luca and myself - we'll look at backporting later)
       * add software implementations for new ciphers (Jouni)
       * add a new ACPI ID for Broadcom's rfkill (Mika)
       * allow using netns FD for wireless (Vadim)
       * some other cleanups (various)
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      940288b6
    • Praveen Madhavan's avatar
      csiostor:Use firmware version from cxgb4/t4fw_version.h · 541c571f
      Praveen Madhavan authored
      
      
      This patch is to use firmware version macros from t4fw_version.h
      and also enables 40g T5 adapter.
      
      Signed-off-by: default avatarPraveen Madhavan <praveenm@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      541c571f
    • Nicholas Mc Guire's avatar
      tlan: msecs_to_jiffies convrsion · b5057dd7
      Nicholas Mc Guire authored
      
      
      This is only an API consolidation and should make things more readable
      it replaces var * HZ / 1000 by msecs_to_jiffies(var).
      
      As there is a discrepancy between the code and the comments this is in
      a separate patch.
      
      Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b5057dd7
    • Nicholas Mc Guire's avatar
      tlan: use msecs_to_jiffies for conversion · 51fd9471
      Nicholas Mc Guire authored
      
      
      This is only an API consolidation and should make things more readable
      it replaces var * HZ / 1000 by msecs_to_jiffies(var).
      
      Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      51fd9471
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 45e826fd
      David S. Miller authored
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2015-02-03
      
      Here's what's likely the last bluetooth-next pull request for 3.20.
      Notable changes include:
      
       - xHCI workaround + a new id for the ath3k driver
       - Several new ids for the btusb driver
       - Support for new Intel Bluetooth controllers
       - Minor cleanups to ieee802154 code
       - Nested sleep warning fix in socket accept() code path
       - Fixes for Out of Band pairing handling
       - Support for LE scan restarting for HCI_QUIRK_STRICT_DUPLICATE_FILTER
       - Improvements to data we expose through debugfs
       - Proper handling of Hardware Error HCI events
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      45e826fd
    • Tom Herbert's avatar
      net: add skb functions to process remote checksum offload · dcdc8994
      Tom Herbert authored
      
      
      This patch adds skb_remcsum_process and skb_gro_remcsum_process to
      perform the appropriate adjustments to the skb when receiving
      remote checksum offload.
      
      Updated vxlan and gue to use these functions.
      
      Tested: Ran TCP_RR and TCP_STREAM netperf for VXLAN and GUE, did
      not see any change in performance.
      
      Signed-off-by: default avatarTom Herbert <therbert@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dcdc8994
    • Siva Mannem's avatar
      bridge: Let bridge not age 'externally' learnt FDB entries, they are removed... · 9a05dde5
      Siva Mannem authored
      
      bridge: Let bridge not age 'externally' learnt FDB entries, they are removed when 'external' entity notifies the aging
      
      When 'learned_sync' flag is turned on, the offloaded switch
       port syncs learned MAC addresses to bridge's FDB via switchdev notifier
       (NETDEV_SWITCH_FDB_ADD). Currently, FDB entries learnt via this mechanism are
       wrongly being deleted by bridge aging logic. This patch ensures that FDB
       entries synced from offloaded switch ports are not deleted by bridging logic.
       Such entries can only be deleted via switchdev notifier
       (NETDEV_SWITCH_FDB_DEL).
      
      Signed-off-by: default avatarSiva Mannem <siva.mannem.lnx@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9a05dde5
    • LEROY Christophe's avatar
      net: fs_enet: Implement NETIF_F_SG feature · 4fc9b87b
      LEROY Christophe authored
      
      
      Freescale ethernet controllers have the capability to re-assemble fragmented
      data into a single ethernet frame. This patch uses this capability and
      implements NETIP_F_SG feature into the fs_enet ethernet driver.
      
      On a MPC885, I get 53% performance improvement on a ftp transfer of a 15Mb file:
        * Without the patch : 2,8 Mbps
        * With the patch : 4,3 Mbps
      
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4fc9b87b
    • Eric Dumazet's avatar
      xps: fix xps for stacked devices · 2bd82484
      Eric Dumazet authored
      
      
      A typical qdisc setup is the following :
      
      bond0 : bonding device, using HTB hierarchy
      eth1/eth2 : slaves, multiqueue NIC, using MQ + FQ qdisc
      
      XPS allows to spread packets on specific tx queues, based on the cpu
      doing the send.
      
      Problem is that dequeues from bond0 qdisc can happen on random cpus,
      due to the fact that qdisc_run() can dequeue a batch of packets.
      
      CPUA -> queue packet P1 on bond0 qdisc, P1->ooo_okay=1
      CPUA -> queue packet P2 on bond0 qdisc, P2->ooo_okay=0
      
      CPUB -> dequeue packet P1 from bond0
              enqueue packet on eth1/eth2
      CPUC -> dequeue packet P2 from bond0
              enqueue packet on eth1/eth2 using sk cache (ooo_okay is 0)
      
      get_xps_queue() then might select wrong queue for P1, since current cpu
      might be different than CPUA.
      
      P2 might be sent on the old queue (stored in sk->sk_tx_queue_mapping),
      if CPUC runs a bit faster (or CPUB spins a bit on qdisc lock)
      
      Effect of this bug is TCP reorders, and more generally not optimal
      TX queue placement. (A victim bulk flow can be migrated to the wrong TX
      queue for a while)
      
      To fix this, we have to record sender cpu number the first time
      dev_queue_xmit() is called for one tx skb.
      
      We can union napi_id (used on receive path) and sender_cpu,
      granted we clear sender_cpu in skb_scrub_packet() (credit to Willem for
      this union idea)
      
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Willem de Bruijn <willemb@google.com>
      Cc: Nandita Dukkipati <nanditad@google.com>
      Cc: Yuchung Cheng <ycheng@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2bd82484