1. 17 Mar, 2017 31 commits
  2. 16 Mar, 2017 9 commits
    • David S. Miller's avatar
      Merge branch 'sched-cleanups' · cd918afd
      David S. Miller authored
      Or Gerlitz says:
      
      ====================
      small set of sched cleanups
      
      Just two cleanups -- but for the 2nd one I think we need ack from
      Cong Wang to make sure this isn't actually a bug report..
      
      changes from V1:
        - addressed comment from Sergei to use 12 hex digits etc
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cd918afd
    • Or Gerlitz's avatar
      net/sched: fq_codel: Avoid set-but-unused variable · a5e6a3b0
      Or Gerlitz authored
      The code introduced by commit 2ccccf5f ("net_sched: update
      hierarchical backlog too") only sets prev_backlog in fq_codel_dequeue()
      but not using that anywhere, remove that setting.
      
      Cc: Cong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a5e6a3b0
    • Or Gerlitz's avatar
      net/sched: act_ife: Staticfy find_decode_metaid() · 4dba87b0
      Or Gerlitz authored
      As it's used only on that file.
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4dba87b0
    • Steve Lin's avatar
      net: ethernet: bgmac: Allow MAC address to be specified in DTB · 2f771399
      Steve Lin authored
      Allows the BCMA version of the bgmac driver to obtain MAC address
      from the device tree.  If no MAC address is specified there, then
      the previous behavior (obtaining MAC address from SPROM) is
      used.
      Signed-off-by: default avatarSteve Lin <steven.lin1@broadcom.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Acked-by: default avatarJon Mason <jon.mason@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2f771399
    • Christophe Leroy's avatar
      net: ethernet: fs_enet: Remove useless includes · 01ac2994
      Christophe Leroy authored
      CONFIG_8xx is being deprecated. Since the includes dependent on
      CONFIG_8xx are useless, just drop them.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      01ac2994
    • Christophe Leroy's avatar
      isdn: hardware: mISDN: Remove reference to CONFIG_8xx · b79df0fc
      Christophe Leroy authored
      CONFIG_8xx is deprecated and should soon be removed in favor
      of CONFIG_PPC_8xx.
      Anyway, hfc_multi_8xx.h only uses 8xx I/O ports which are
      linked to the CPM1 communication processor included in the 8xx
      rather than the 8xx itself.
      
      This patch therefore makes it dependent on CONFIG_CPM1 instead,
      like several other drivers.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b79df0fc
    • Jane Li's avatar
      net: mvneta: support suspend and resume · 9768b45c
      Jane Li authored
      Add basic support for handling suspend and resume.
      Signed-off-by: default avatarJane Li <jiel@marvell.com>
      Reviewed-by: default avatarJisheng Zhang <jszhang@marvell.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9768b45c
    • David S. Miller's avatar
      Merge branch 'mlxsw-vrf' · 7e3f4f3a
      David S. Miller authored
      Jiri Pirko says:
      
      ====================
      mlxsw: Enable VRF offload
      
      Ido says:
      
      Packets received from netdevs enslaved to different VRF devices are
      forwarded using different FIB tables. In the Spectrum ASIC this is
      achieved by binding different router interfaces (RIFs) to different
      virtual routers (VRs). Each RIF represents an enslaved netdev and each
      VR has its own FIB table according to which packets are forwarded.
      
      The first three patches add an helper to check if a FIB rule is a
      default rule and extend the FIB notification chain to include the rule's
      info as part of the RULE_{ADD,DEL} events. This allows offloading
      drivers to sanitize the rules they don't support and flush their tables.
      
      The fourth patch introduces a small change in the VRF driver to allow
      capable drivers to more easily offload VRFs.
      
      Finally, the last patches gradually add support for VRFs in the mlxsw
      driver. First, on top of port netdevs, stacked LAG and VLAN devices and
      then on top of bridges.
      
      Some limitations I would like to point out:
      
      1) The old model where 'oif' / 'iif' rules were programmed for each L3
      master device isn't supported. Upon insertion of these rules the driver
      will flush its tables and forwarding will be done by the kernel instead.
      It's inferior in every way to the single 'l3mdev' rule, so this shouldn't
      be an issue.
      
      2) Inter-VRF routes pointing to a VRF device aren't offloaded. Packets
      hitting these routes will be forwarded by the kernel. Inter-VRF routes
      pointing to netdevs enslaved to a different VRF are offloaded.
      
      3) There's a small discrepancy between the kernel's datapath and the
      device's. By default, packets forwarded by the kernel first do a lookup
      in the local table and then in the VRF's table (assuming no match). In
      the device, lookup is done only in the VRF's table, which is probably
      the intended behavior. Changes in v2 allow user to properly re-order the
      default rules without triggering the abort mechanism.
      
      Changes in v3:
      * Remove 'l3mdev' from the matchall list, as it's related to the action
        and not the selector (David Ahern).
      * Use container_of() instead of typecasting (David Ahern).
      * Add David's Acked-by to the second patch.
      * Add an helper in IPv4 code to check if rule is a default rule (David
        Ahern).
      
      Changes in v2:
      * Drop default rule indication and allow re-ordering of default rules
        (David Ahern).
      * Remove ifdef around 'struct fib_rule_notifier_info' and drop redundant
        dependency on IP_MULTIPLE_TABLES from rocker and mlxsw.
      * Add David's Acked-by to the fourth patch.
      * Remove netif_is_vrf_master() and use netif_is_l3_master() instead
        (David Ahern).
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7e3f4f3a
    • Ido Schimmel's avatar
      mlxsw: spectrum_router: Don't abort on l3mdev rules · c7f6e665
      Ido Schimmel authored
      Now that port netdevs can be enslaved to a VRF master we need to make
      sure the device's routing tables won't be flushed upon the insertion of
      a l3mdev rule.
      
      Note that we assume the notified l3mdev rule is a simple rule as used by
      the VRF master. We don't check for the presence of other selectors such
      as 'iif' and 'oif'.
      Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c7f6e665