1. 03 3月, 2016 27 次提交
  2. 02 3月, 2016 13 次提交
    • D
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · 7da5ee09
      David S. Miller 提交于
      Antonio Quartulli says:
      
      ====================
      batman-adv 20160229
      
      this is our (hopefully) latest batch of patches intended for net-next.
      
      With this patchset we finally introduce B.A.T.M.A.N. V: the latest
      version of our routing protocol.
      Technical documentation describing the protocol in more detail can
      be found in our wiki[1][2][3][4].
      
      For what concerns this pull request, you can find the high level
      description right below.
      
      [1] https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V
      [2] https://www.open-mesh.org/projects/batman-adv/wiki/OGMv2
      [3] https://www.open-mesh.org/projects/batman-adv/wiki/ELP
      [4] https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V_Tests
      
       ...
      
      With this patchset we finally introduce our new routing protocol:
      B.A.T.M.A.N. V. Its implementation started quite some years ago,
      but due to the big changes being introduced it took a while to be
      discussed, designed, worked, re-worked, tested and debugged (well,
      we're never done with the latest). The entire operation has
      basically been a team work involving all the core contributors
      together with other people interested in the project.
      
      The new protocol is divided into two main subcomponents, called
      respectively ELP and OGMv2. The former is in charge of
      dealing with the neighbour discovery and link quality estimation,
      while the latter implements the algorithm that spreads the
      metrics around the network and computes optimal paths.
      
      The biggest change introduced with B.A.T.M.A.N. V is the new
      metric: the protocol won't rely on packet loss anymore, but it
      will use the estimated throughput extracted directly from the
      wifi driver (when available) by querying cfg80211.
      Batman-adv will also send some unicast probing packets when
      an interface is not used for payload traffic to make sure that
      such values are current.
      
      The new protocol can be compiled-in or not like other
      features we have and when selected will pull in CFG80211 as
      dependency for the reason described above.
      
      Thanks to the big work brought up in the past by Marek Lindner,
      batman-adv can easily deal several protocol implementations,
      therefore compiling in this new version does not exclude the
      older.
      This means that the user is offered the option to choose
      the protocol when creating the mesh interface (default is the
      old one to keep backward compatibility).
      
      Along with the protocol there are some sysfs knobs that are
      introduced to fine tune some of its behaviours, but users
      are recommended to keep the default values unless they know
      what they are doing.
      
      The last patch is about advertising our own patchwork platform
      (thanks to Sven Eckelmann for having set that up!) in the
      MAINTAINERS file.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7da5ee09
    • Z
      net: pktgen: use reset to set mac header · c145aeb3
      Zhang Shengju 提交于
      Since offset is zero, it's not necessary to use set function.
      Signed-off-by: NZhang Shengju <zhangshengju@cmss.chinamobile.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c145aeb3
    • D
      sch_mqprio: Fix build with older gcc. · 241deec9
      David S. Miller 提交于
        CC [M]  net/sched/sch_mqprio.o
      net/sched/sch_mqprio.c: In function ?mqprio_init?:
      net/sched/sch_mqprio.c:145: error: unknown field ?tc? specified in initializer
      net/sched/sch_mqprio.c:145: warning: missing braces around initializer
      net/sched/sch_mqprio.c:145: warning: (near initialization for ?tc.<anonymous>?)
      make[2]: *** [net/sched/sch_mqprio.o] Error 1
      make[1]: *** [net/sched] Error 2
      make: *** [net] Error 2
      
      Several people reported this, surround the unnamed union
      member initialization with braces to fix.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      241deec9
    • S
      of_mdio: kill useless variable in of_mdiobus_register() · 2fca6d28
      Sergei Shtylyov 提交于
      of_mdiobus_register()  declares the 'paddr' variable to hold the result of
      the of_get_property()  but only uses it once after that while the function
      can be called directly from the *if* statement. Remove that variable and
      switch to calling of_find_property() instead since  we don't care about
      the "reg" property's value anyway...
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2fca6d28
    • D
      Merge branch 'qed-next' · 87f761ec
      David S. Miller 提交于
      Yuval Mintz says:
      
      ====================
      qed: Attention support patch series
      
      Until now we've only enabled attention generation for the sake of
      management firmware indications [required for link notifications].
      
      This series enables [almost] all the attention sources of the HW,
      currently for the sake of logging information relating to issues
      experienced by HW. In future, infrastructure laid here would also be used
      for the sake of the recovery process.
      
      The first patch in the series is a semantic alignemnt of the code.
      The later 3 patches incremently create said infrastructure and enrich
      the logged information.
      Notice #3 contains quite a bit of structures [consisting of ~1K lines]
      that will eventually be removed and incorporated in the binary fw file.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      87f761ec
    • Y
      qed: Print additional HW attention info · b4149dc7
      Yuval Mintz 提交于
      This patch utilizes the attention infrastructure to log additional
      information that relates only to specific HW blocks.
      For some of those HW blocks, it also stops automatically disabling the
      attention generation as the attention is considered benign and thus
      should only be logged; No fear of it flooding the system.
      Signed-off-by: NYuval Mintz <Yuval.Mintz@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b4149dc7
    • Y
      qed: Print HW attention reasons · ff38577a
      Yuval Mintz 提交于
      Each HW block contains common information about attention reasons,
      raising a bit for each one of the different sub-reasons that caused it
      to raise an attention.
      
      This patch extends the infrastructure by allowing logging of the various
      reasons causing the HW blocks to generate an attention.
      Signed-off-by: NYuval Mintz <Yuval.Mintz@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff38577a
    • Y
      qed: Add support for HW attentions · 0d956e8a
      Yuval Mintz 提交于
      HW is capable of generating attentnions for a multitude of reasons,
      but current driver is enabling attention generation only for management
      firmware [required for link notifications].
      
      This patch enables almost all of the possible reasons for HW attentions,
      logging the HW block generating the attention and preventing further
      attentions from that source [to prevent possible attention flood].
      It also lays the infrastructure for additional exploration of the various
      attentions.
      Signed-off-by: NYuval Mintz <Yuval.Mintz@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0d956e8a
    • Y
      4ac801b7
    • W
      net: remove skb_sender_cpu_clear() · 64d4e343
      WANG Cong 提交于
      After commit 52bd2d62 ("net: better skb->sender_cpu and skb->napi_id cohabitation")
      skb_sender_cpu_clear() becomes empty and can be removed.
      
      Cc: Eric Dumazet <edumazet@google.com>
      Signed-off-by: NCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      64d4e343
    • D
      Merge branch 'mlx5-next' · 8b4837c8
      David S. Miller 提交于
      Saeed Mahameed says:
      
      ====================
      mlx5 driver updates
      
      This series includes some bug fixes and updates for the mlx5 core
      and ethernet driver.
      
      From Gal, two fixes that protects the update CQ moderation flows
      when it is not allowed.
      
      From Moshe, two fixes for the core and ethernet driver in
      non-cached(NC) and write combining(WC) buffers mappings,
      which prevents the driver from double memory mappings.
      
      From Or, reduce the firmware command completion timeout.
      
      From Tariq, several small trivial fixes.
      
      Changes from v0:
      	- "Fix global UAR mapping" commit messages updated to explain ARCH_HAS_IOREMAP_WC usage.
      	- rebased to commit 8d3f2806 'Merge branch ethtool-ksettings'
      
      Changes from v1:
      	- Removed ARCH_HAS_IOREMAP_WC config flag from "Fix global UAR mapping" commit,	as it was not accurate to use it.
      	- Squashed "Fix global UAR mapping" and "net/mlx5: Avoid double mapping of io mapped memory"
      	- Added more info for "Fix global UAR mapping" in commit message
      
      Changes from v2:
      	- None. resubmission per Dave's request due to two parallel submissions to mlx5 driver.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8b4837c8
    • M
      net/mlx5: Fix global UAR mapping · 0ba42241
      Moshe Lazer 提交于
      Avoid double mapping of io mapped memory, Device page may be
      mapped to non-cached(NC) or to write-combining(WC).
      The code before this fix tries to map it both to WC and NC
      contrary to what stated in Intel's software developer manual.
      
      Here we remove the global WC mapping of all UARS
      "dev->priv.bf_mapping", since UAR mapping should be decided
      per UAR (e.g we want different mappings for EQs, CQs vs QPs).
      
      Caller will now have to choose whether to map via
      write-combining API or not.
      
      mlx5e SQs will choose write-combining in order to perform
      BlueFlame writes.
      
      Fixes: 88a85f99 ('TX latency optimization to save DMA reads')
      Signed-off-by: NMoshe Lazer <moshel@mellanox.com>
      Reviewed-by: NAchiad Shochat <achiad@mellanox.com>
      Signed-off-by: NSaeed Mahameed <saeedm@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0ba42241
    • O
      net/mlx5: Make command timeout way shorter · 6b6c07bd
      Or Gerlitz 提交于
      The command timeout is terribly long, whole two hours. Make it 60s so if
      things do go wrong, the user gets feedback in relatively short time, so
      they can take corrective actions and/or investigate using tools and such.
      
      Fixes: e126ba97 ('mlx5: Add driver for Mellanox Connect-IB adapters')
      Signed-off-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: NLeon Romanovsky <leonro@mellanox.com>
      Signed-off-by: NSaeed Mahameed <saeedm@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6b6c07bd