1. 01 11月, 2016 34 次提交
  2. 31 10月, 2016 6 次提交
    • G
      driver: tun: Use new macro SOCK_IOC_TYPE instead of literal number 0x89 · 20861f26
      Gao Feng 提交于
      The current codes use _IOC_TYPE(cmd) == 0x89 to check if the cmd is one
      socket ioctl command like SIOCGIFHWADDR. But the literal number 0x89 may
      confuse readers. So create one macro SOCK_IOC_TYPE to enhance the readability.
      Signed-off-by: NGao Feng <fgao@ikuai8.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      20861f26
    • A
      net: add an ioctl to get a socket network namespace · c62cce2c
      Andrey Vagin 提交于
      Each socket operates in a network namespace where it has been created,
      so if we want to dump and restore a socket, we have to know its network
      namespace.
      
      We have a socket_diag to get information about sockets, it doesn't
      report sockets which are not bound or connected.
      
      This patch introduces a new socket ioctl, which is called SIOCGSKNS
      and used to get a file descriptor for a socket network namespace.
      
      A task must have CAP_NET_ADMIN in a target network namespace to
      use this ioctl.
      
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: NAndrei Vagin <avagin@openvz.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c62cce2c
    • D
      mv643xx_eth: Properly resolve merge conflict. · 2a43ca0a
      David S. Miller 提交于
      The second SET_NETDEV_DEV() in the hunk should be
      removed.
      Reported-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2a43ca0a
    • D
      mv643xx_eth: Fix merge error. · d8e4aa07
      David S. Miller 提交于
      One merge conflict block wasn't resolved.
      Reported-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d8e4aa07
    • D
      Merge tag 'shared-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma · 0a6ce1e3
      David S. Miller 提交于
      Saeed Mahameed says:
      
      ====================
      Mellanox mlx5 core driver updates 2016-10-25
      
      This series contains some updates and fixes of mlx5 core and
      IB drivers with the addition of two features that demand
      new low level commands and infrastructure updates.
       - SRIOV VF max rate limit support
       - mlx5e tc support for FWD rules with counter.
      
      Needed for both net and rdma subsystems.
      
      Updates and Fixes:
      From Saeed Mahameed (2):
        - mlx5 IB: Skip handling unknown mlx5 events
        - Add ConnectX-5 PCIe 4.0 VF device ID
      
      From Artemy Kovalyov (2):
        - Update struct mlx5_ifc_xrqc_bits
        - Ensure SRQ physical address structure endianness
      
      From Eugenia Emantayev (1):
        - Fix length of async_event_mask
      
      New Features:
      From Mohamad Haj Yahia (3): mlx5 SRIOV VF max rate limit support
        - Introduce TSAR manipulation firmware commands
        - Introduce E-switch QoS management
        - Add SRIOV VF max rate configuration support
      
      From Mark Bloch (7): mlx5e Tc support for FWD rule with counter
        - Don't unlock fte while still using it
        - Use fte status to decide on firmware command
        - Refactor find_flow_rule
        - Group similar rules under the same fte
        - Add multi dest support
        - Add option to add fwd rule with counter
        - mlx5e tc support for FWD rule with counter
        Mark here fixed two trivial issues with the flow steering core, and did
        some refactoring in the flow steering API to support adding mulit destination
        rules to the same hardware flow table entry at once.  In the last two patches
        added the ability to populate a flow rule with a flow counter to the same flow entry.
      
      V2: Dropped some patches that added new structures without adding any usage of them.
          Added SRIOV VF max rate configuration support patch that introduces
          the usage of the TSAR infrastructure.
          Added flow steering fixes and refactoring in addition to mlx5 tc
          support for forward rule with counter.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0a6ce1e3
    • P
      net: bonding: use new api ethtool_{get|set}_link_ksettings · d46b6349
      Philippe Reynes 提交于
      The ethtool api {get|set}_settings is deprecated.
      We move this driver to new api {get|set}_link_ksettings.
      Signed-off-by: NPhilippe Reynes <tremyfr@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d46b6349