Commit 68cc2999 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'devlink-small-spring-cleanup' 



Jiri Pirko says:

====================
devlink: small spring cleanup

Mostly cosmetics and janitor work.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 956ca8fc f6b19b35

drivers/net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ source "drivers/net/hyperv/Kconfig" 
config NETDEVSIM

	tristate "Simulated networking device"

	depends on DEBUG_FS

	select NET_DEVLINK

	help

	  This driver is a developer testing tool and software model that can

	  be used to test various control path networking APIs, especially

drivers/net/ethernet/broadcom/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ config BNXT 
	depends on PCI

	select FW_LOADER

	select LIBCRC32C

	select NET_DEVLINK

	---help---

	  This driver supports Broadcom NetXtreme-C/E 10/25/40/50 gigabit

	  Ethernet cards.  To compile this driver as a module, choose M here:

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/pci.h>

#include <linux/netdevice.h>

#include <net/devlink.h>

#include "bnxt_hsi.h"

#include "bnxt.h"

#include "bnxt_vfr.h"
@@ -228,6 +229,8 @@ int bnxt_dl_register(struct bnxt *bp) 
		goto err_dl_unreg;

	}



	devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,

			       bp->pf.port_id, false, 0);

	rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);

	if (rc) {

		netdev_err(bp->dev, "devlink_port_register failed");

drivers/net/ethernet/cavium/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ config LIQUIDIO 
	imply PTP_1588_CLOCK

	select FW_LOADER

	select LIBCRC32C

	select NET_DEVLINK

	---help---

	  This driver supports Cavium LiquidIO Intelligent Server Adapters

	  based on CN66XX, CN68XX and CN23XX chips.

drivers/net/ethernet/mellanox/mlx4/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config MLX4_EN_DCB 
config MLX4_CORE

	tristate

	depends on PCI

	select NET_DEVLINK

	default n



config MLX4_DEBUG