1. 18 Feb, 2019 2 commits
    • Masahiro Yamada's avatar
      net: hamradio: remove unused hweight*() defines · ed95799b
      Masahiro Yamada authored
      This file does not use hweight*() at all, and the definition is
      surrounded by #if 0 ... #endif.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ed95799b
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 8bbed40f
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter/IPVS updates for net-next
      
      The following patchset contains Netfilter/IPVS updates for you net-next
      tree:
      
      1) Missing NFTA_RULE_POSITION_ID netlink attribute validation,
         from Phil Sutter.
      
      2) Restrict matching on tunnel metadata to rx/tx path, from wenxu.
      
      3) Avoid indirect calls for IPV6=y, from Florian Westphal.
      
      4) Add two indirections to prepare merger of IPV4 and IPV6 nat
         modules, from Florian Westphal.
      
      5) Broken indentation in ctnetlink, from Colin Ian King.
      
      6) Patches to use struct_size() from netfilter and IPVS,
         from Gustavo A. R. Silva.
      
      7) Display kernel splat only once in case of racing to confirm
         conntrack from bridge plus nfqueue setups, from Chieh-Min Wang.
      
      8) Skip checksum validation for layer 4 protocols that don't need it,
         patch from Alin Nastac.
      
      9) Sparse warning due to symbol that should be static in CLUSTERIP,
         from Wei Yongjun.
      
      10) Add new toggle to disable SDP payload translation when media
          endpoint is reachable though the same interface as the signalling
          peer, from Alin Nastac.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8bbed40f
  2. 17 Feb, 2019 34 commits
  3. 16 Feb, 2019 4 commits
    • David S. Miller's avatar
      Merge tag 'mlx5-updates-2019-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux · f2281c24
      David S. Miller authored
      Saeed Mahameed says:
      
      ====================
      Support Mellanox BlueField SmartNIC (mlx5-updates-2019-02-15)
      
      Bodong Wang says,
      
      BlueField device is a multi-core ARM processor in a highly integrated
      system on chip coupled with the ConnectX interconnect controller.
      BlueField device can be presented in one out of two modes:
      
      - SEPARATED_HOST: ARM processors as a separated and orthogonal host
        like any other external host in the multi-host virtualization model.
      - EMBEDDED_CPU: ARM processors as Embedded CPU (EC) and part of the
        external hosts virtualization model.
      
      While existing driver already supports the device on separated_host
      mode, this patch series focus on the functionalities of embedded_cpu
      mode.
      
      On embedded_cpu mode, BlueField device exposes regular network
      controller PCI function in the BlueField host(e.g, x86). However, a
      separate PCI function called Embedded CPU Physical Function(ECPF) is
      also added to the ARM host side, where standard Linux distributions is
      able to run on the ARM cores. Depends on the NV configuration from
      firmware, ECPF can be the e-switch manager and firmware pages supplier.
      If ECPF is configured as e-switch manager and page supplier, it will
      take over the responsibilities from the PF on BlueField host includes:
      - Owns, controls and manages all e-switch parts, and takes e-switch
        traffic by default. It also should perform ENABLE_HCA for the host
        PF just like a PF does for its VFs.
      - Provides and manages the ICM host memory required for the HCA to
        store various contexts for itself, the PF and VFs belong the
        e-switch it manages.
      
      The PF on BlueField host side is still responsible for:
      - Control its own permanent MAC.
      - PCI and SRIOV configurations and perform ENABLE_HCA for its VFs.
      
      The ECPF can also retrieve information about the external host it
      controls, like host identifier, PCI BDF and number of virtual functions.
      As these parameters may be changed dynamically, an event will be triggered
      to the driver on ECPF side.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f2281c24
    • Alin Nastac's avatar
      netfilter: nf_conntrack_sip: add sip_external_media logic · a3419ce3
      Alin Nastac authored
      When enabled, the sip_external_media logic will leave SDP
      payload untouched when it detects that interface towards INVITEd
      party is the same with the one towards media endpoint.
      
      The typical scenario for this logic is when a LAN SIP agent has more
      than one IP address (uses a different address for media streams than
      the one used on signalling stream) and it also forwards calls to a
      voice mailbox located on the WAN side. In such case sip_direct_media
      must be disabled (so normal calls could be handled by the SIP
      helper), but media streams that are not traversing this router must
      also be excluded from address translation (e.g. call forwards).
      Signed-off-by: default avatarAlin Nastac <alin.nastac@gmail.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      a3419ce3
    • Wei Yongjun's avatar
      netfilter: ipt_CLUSTERIP: make symbol 'cip_netdev_notifier' static · dddaf89e
      Wei Yongjun authored
      Fixes the following sparse warnings:
      
      net/ipv4/netfilter/ipt_CLUSTERIP.c:867:23: warning:
       symbol 'cip_netdev_notifier' was not declared. Should it be static?
      
      Fixes: 5a86d68b ("netfilter: ipt_CLUSTERIP: fix deadlock in netns exit routine")
      Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      dddaf89e
    • David S. Miller's avatar
      Merge branch 's390-next' · bb015f22
      David S. Miller authored
      Julian Wiedmann says:
      
      ====================
      s390/qeth: updates 2019-02-15
      
      please apply a few more qeth patches to net-next. Along with some smaller
      improvements, this revamps our code for the SW statistics that are exposed
      through ETHTOOL_GSTATS.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bb015f22