Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a6b6f51 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by David S. Miller
Browse files

DCB: fix kconfig option 



Since the netlink option for DCB is necessary to actually be useful,
simplified the Kconfig option.  In addition, added useful help text for the
Kconfig option.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 411c41ee

drivers/net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -2451,10 +2451,10 @@ config IXGBE_DCA 
	  driver.  DCA is a method for warming the CPU cache before data

	  is used, with the intent of lessening the impact of cache misses.



config IXGBE_DCBNL

config IXGBE_DCB

	bool "Data Center Bridging (DCB) Support"

	default n

	depends on IXGBE && DCBNL

	depends on IXGBE && DCB

	---help---

	  Say Y here if you want to use Data Center Bridging (DCB) in the

	  driver.

drivers/net/ixgbe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,4 +35,4 @@ obj-$(CONFIG_IXGBE) += ixgbe.o 
ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \

              ixgbe_82598.o ixgbe_phy.o



ixgbe-$(CONFIG_IXGBE_DCBNL) +=  ixgbe_dcb.o ixgbe_dcb_82598.o ixgbe_dcb_nl.o
 
ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o ixgbe_dcb_nl.o

drivers/net/ixgbe/ixgbe.h

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ enum ixgbe_boards { 
};



extern struct ixgbe_info ixgbe_82598_info;

#ifdef CONFIG_IXGBE_DCBNL

#ifdef CONFIG_IXGBE_DCB

extern struct dcbnl_rtnl_ops dcbnl_ops;

extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,

                              struct ixgbe_dcb_config *dst_dcb_cfg,

drivers/net/ixgbe/ixgbe_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1914,7 +1914,7 @@ static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter) 
	}

}



#ifdef CONFIG_IXGBE_DCBNL

#ifdef CONFIG_IXGBE_DCB

/*

 * ixgbe_configure_dcb - Configure DCB hardware

 * @adapter: ixgbe adapter struct
@@ -1960,7 +1960,7 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter) 
	ixgbe_set_rx_mode(netdev);



	ixgbe_restore_vlan(adapter);

#ifdef CONFIG_IXGBE_DCBNL

#ifdef CONFIG_IXGBE_DCB

	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {

		netif_set_gso_max_size(netdev, 32768);

		ixgbe_configure_dcb(adapter);
@@ -2749,7 +2749,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
	struct ixgbe_hw *hw = &adapter->hw;

	struct pci_dev *pdev = adapter->pdev;

	unsigned int rss;

#ifdef CONFIG_IXGBE_DCBNL

#ifdef CONFIG_IXGBE_DCB

	int j;

	struct tc_configuration *tc;

#endif
@@ -2768,7 +2768,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
	adapter->flags |= IXGBE_FLAG_RSS_ENABLED;

	adapter->ring_feature[RING_F_DCB].indices = IXGBE_MAX_DCB_INDICES;



#ifdef CONFIG_IXGBE_DCBNL

#ifdef CONFIG_IXGBE_DCB

	/* Configure DCB traffic classes */

	for (j = 0; j < MAX_TRAFFIC_CLASS; j++) {

		tc = &adapter->dcb_cfg.tc_config[j];
@@ -4120,7 +4120,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)

		adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;



#ifdef CONFIG_IXGBE_DCBNL

#ifdef CONFIG_IXGBE_DCB

	netdev->dcbnl_ops = &dcbnl_ops;

#endif

include/linux/netdevice.h

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


#include <net/net_namespace.h>

#include <net/dsa.h>

#ifdef CONFIG_DCBNL

#ifdef CONFIG_DCB

#include <net/dcbnl.h>

#endif
@@ -847,7 +847,7 @@ struct net_device 
#define GSO_MAX_SIZE		65536

	unsigned int		gso_max_size;



#ifdef CONFIG_DCBNL

#ifdef CONFIG_DCB

	/* Data Center Bridging netlink ops */

	struct dcbnl_rtnl_ops *dcbnl_ops;

#endif