1. 11 5月, 2016 13 次提交
  2. 10 5月, 2016 25 次提交
  3. 09 5月, 2016 2 次提交
    • D
      Merge branch 'mlx5-build-fix' · 8846a125
      David S. Miller 提交于
      Saeed Mahameed says:
      
      ====================
      net/mlx5e: Kconfig fixes for VxLAN
      
      Reposting to net the build errors fixes posted by Arnd last week.
      
      Originally Arnd posted those fixes to net-next, while the issue
      is also seen in net.  For net-next a different approach is required
      for fixing the issue as VXLAN and Device Drivers are no longer
      dependent, but there is no harm for those fixes to get into net-next.
      
      Optionally, once net is merged into net-next we can
      Revert "net/mlx5e: make VXLAN support conditional" as the
      CONFIG_MLX5_CORE_EN_VXLAN will no longer be required.
      
      Applied on top: 28892865 ('mlxsw: spectrum: Add missing rollback in flood configuration')
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8846a125
    • A
      net/mlx5e: make VXLAN support conditional · 7dbb2917
      Arnd Bergmann 提交于
      VXLAN can be disabled at compile-time or it can be a loadable
      module while mlx5 is built-in, which leads to a link error:
      
      drivers/net/built-in.o: In function `mlx5e_create_netdev':
      ntb_netdev.c:(.text+0x106de4): undefined reference to `vxlan_get_rx_port'
      
      This avoids the link error and makes the vxlan code optional,
      like the other ethernet drivers do as well.
      
      Link: https://patchwork.ozlabs.org/patch/589296/
      Fixes: b3f63c3d ("net/mlx5e: Add netdev support for VXLAN tunneling")
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NSaeed Mahameed <saeedm@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7dbb2917