aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/Kconfig4
-rw-r--r--drivers/net/ixgbe/Makefile2
-rw-r--r--drivers/net/ixgbe/ixgbe.h2
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c10
-rw-r--r--include/linux/netdevice.h4
-rw-r--r--net/Makefile4
-rw-r--r--net/dcb/Kconfig24
-rw-r--r--net/dcb/dcbnl.c2
8 files changed, 31 insertions, 21 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index efd461d7c2bb..75f9f7f2fbed 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2451,10 +2451,10 @@ config IXGBE_DCA
2451 driver. DCA is a method for warming the CPU cache before data 2451 driver. DCA is a method for warming the CPU cache before data
2452 is used, with the intent of lessening the impact of cache misses. 2452 is used, with the intent of lessening the impact of cache misses.
2453 2453
2454config IXGBE_DCBNL 2454config IXGBE_DCB
2455 bool "Data Center Bridging (DCB) Support" 2455 bool "Data Center Bridging (DCB) Support"
2456 default n 2456 default n
2457 depends on IXGBE && DCBNL 2457 depends on IXGBE && DCB
2458 ---help--- 2458 ---help---
2459 Say Y here if you want to use Data Center Bridging (DCB) in the 2459 Say Y here if you want to use Data Center Bridging (DCB) in the
2460 driver. 2460 driver.
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile
index 3228e508e628..6e7ef765bcd8 100644
--- a/drivers/net/ixgbe/Makefile
+++ b/drivers/net/ixgbe/Makefile
@@ -35,4 +35,4 @@ obj-$(CONFIG_IXGBE) += ixgbe.o
35ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \ 35ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
36 ixgbe_82598.o ixgbe_phy.o 36 ixgbe_82598.o ixgbe_phy.o
37 37
38ixgbe-$(CONFIG_IXGBE_DCBNL) += ixgbe_dcb.o ixgbe_dcb_82598.o ixgbe_dcb_nl.o 38ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o ixgbe_dcb_nl.o
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 9509aee2d361..6cbf26e3db80 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -327,7 +327,7 @@ enum ixgbe_boards {
327}; 327};
328 328
329extern struct ixgbe_info ixgbe_82598_info; 329extern struct ixgbe_info ixgbe_82598_info;
330#ifdef CONFIG_IXGBE_DCBNL 330#ifdef CONFIG_IXGBE_DCB
331extern struct dcbnl_rtnl_ops dcbnl_ops; 331extern struct dcbnl_rtnl_ops dcbnl_ops;
332extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg, 332extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
333 struct ixgbe_dcb_config *dst_dcb_cfg, 333 struct ixgbe_dcb_config *dst_dcb_cfg,
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 6620397a1fb4..667a6463193d 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1914,7 +1914,7 @@ static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter)
1914 } 1914 }
1915} 1915}
1916 1916
1917#ifdef CONFIG_IXGBE_DCBNL 1917#ifdef CONFIG_IXGBE_DCB
1918/* 1918/*
1919 * ixgbe_configure_dcb - Configure DCB hardware 1919 * ixgbe_configure_dcb - Configure DCB hardware
1920 * @adapter: ixgbe adapter struct 1920 * @adapter: ixgbe adapter struct
@@ -1960,7 +1960,7 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter)
1960 ixgbe_set_rx_mode(netdev); 1960 ixgbe_set_rx_mode(netdev);
1961 1961
1962 ixgbe_restore_vlan(adapter); 1962 ixgbe_restore_vlan(adapter);
1963#ifdef CONFIG_IXGBE_DCBNL 1963#ifdef CONFIG_IXGBE_DCB
1964 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { 1964 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
1965 netif_set_gso_max_size(netdev, 32768); 1965 netif_set_gso_max_size(netdev, 32768);
1966 ixgbe_configure_dcb(adapter); 1966 ixgbe_configure_dcb(adapter);
@@ -2749,7 +2749,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
2749 struct ixgbe_hw *hw = &adapter->hw; 2749 struct ixgbe_hw *hw = &adapter->hw;
2750 struct pci_dev *pdev = adapter->pdev; 2750 struct pci_dev *pdev = adapter->pdev;
2751 unsigned int rss; 2751 unsigned int rss;
2752#ifdef CONFIG_IXGBE_DCBNL 2752#ifdef CONFIG_IXGBE_DCB
2753 int j; 2753 int j;
2754 struct tc_configuration *tc; 2754 struct tc_configuration *tc;
2755#endif 2755#endif
@@ -2768,7 +2768,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
2768 adapter->flags |= IXGBE_FLAG_RSS_ENABLED; 2768 adapter->flags |= IXGBE_FLAG_RSS_ENABLED;
2769 adapter->ring_feature[RING_F_DCB].indices = IXGBE_MAX_DCB_INDICES; 2769 adapter->ring_feature[RING_F_DCB].indices = IXGBE_MAX_DCB_INDICES;
2770 2770
2771#ifdef CONFIG_IXGBE_DCBNL 2771#ifdef CONFIG_IXGBE_DCB
2772 /* Configure DCB traffic classes */ 2772 /* Configure DCB traffic classes */
2773 for (j = 0; j < MAX_TRAFFIC_CLASS; j++) { 2773 for (j = 0; j < MAX_TRAFFIC_CLASS; j++) {
2774 tc = &adapter->dcb_cfg.tc_config[j]; 2774 tc = &adapter->dcb_cfg.tc_config[j];
@@ -4120,7 +4120,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
4120 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) 4120 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
4121 adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED; 4121 adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
4122 4122
4123#ifdef CONFIG_IXGBE_DCBNL 4123#ifdef CONFIG_IXGBE_DCB
4124 netdev->dcbnl_ops = &dcbnl_ops; 4124 netdev->dcbnl_ops = &dcbnl_ops;
4125#endif 4125#endif
4126 4126
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 76a89f8e6a19..0df0db068ac3 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -43,7 +43,7 @@
43 43
44#include <net/net_namespace.h> 44#include <net/net_namespace.h>
45#include <net/dsa.h> 45#include <net/dsa.h>
46#ifdef CONFIG_DCBNL 46#ifdef CONFIG_DCB
47#include <net/dcbnl.h> 47#include <net/dcbnl.h>
48#endif 48#endif
49 49
@@ -847,7 +847,7 @@ struct net_device
847#define GSO_MAX_SIZE 65536 847#define GSO_MAX_SIZE 65536
848 unsigned int gso_max_size; 848 unsigned int gso_max_size;
849 849
850#ifdef CONFIG_DCBNL 850#ifdef CONFIG_DCB
851 /* Data Center Bridging netlink ops */ 851 /* Data Center Bridging netlink ops */
852 struct dcbnl_rtnl_ops *dcbnl_ops; 852 struct dcbnl_rtnl_ops *dcbnl_ops;
853#endif 853#endif
diff --git a/net/Makefile b/net/Makefile
index e5af3dc3a037..ba4460432b7c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -56,8 +56,8 @@ obj-$(CONFIG_NETLABEL) += netlabel/
56obj-$(CONFIG_IUCV) += iucv/ 56obj-$(CONFIG_IUCV) += iucv/
57obj-$(CONFIG_RFKILL) += rfkill/ 57obj-$(CONFIG_RFKILL) += rfkill/
58obj-$(CONFIG_NET_9P) += 9p/ 58obj-$(CONFIG_NET_9P) += 9p/
59ifeq ($(CONFIG_DCBNL),y) 59ifneq ($(CONFIG_DCB),)
60obj-$(CONFIG_DCB) += dcb/ 60obj-y += dcb/
61endif 61endif
62 62
63ifeq ($(CONFIG_NET),y) 63ifeq ($(CONFIG_NET),y)
diff --git a/net/dcb/Kconfig b/net/dcb/Kconfig
index bdf38802d339..4066d59c8de5 100644
--- a/net/dcb/Kconfig
+++ b/net/dcb/Kconfig
@@ -1,12 +1,22 @@
1config DCB 1config DCB
2 tristate "Data Center Bridging support" 2 bool "Data Center Bridging support"
3
4config DCBNL
5 bool "Data Center Bridging netlink interface support"
6 depends on DCB
7 default n 3 default n
8 ---help--- 4 ---help---
9 This option turns on the netlink interface 5 This enables support for configuring Data Center Bridging (DCB)
10 (dcbnl) for Data Center Bridging capable devices. 6 features on DCB capable Ethernet adapters via rtnetlink. Say 'Y'
7 if you have a DCB capable Ethernet adapter which supports this
8 interface and you are connected to a DCB capable switch.
9
10 DCB is a collection of Ethernet enhancements which allow DCB capable
11 NICs and switches to support network traffic with differing
12 requirements (highly reliable, no drops vs. best effort vs. low
13 latency) to co-exist on Ethernet.
14
15 DCB features include:
16 Enhanced Transmission Selection (aka Priority Grouping) - provides a
17 framework for assigning bandwidth guarantees to traffic classes.
18 Priority-based Flow Control (PFC) - a MAC control pause frame which
19 works at the granularity of the 802.1p priority instead of the
20 link (802.3x).
11 21
12 If unsure, say N. 22 If unsure, say N.
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index b2bda3f610df..79a351d323af 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -48,7 +48,7 @@
48 */ 48 */
49 49
50MODULE_AUTHOR("Lucy Liu, <lucy.liu@intel.com>"); 50MODULE_AUTHOR("Lucy Liu, <lucy.liu@intel.com>");
51MODULE_DESCRIPTION("Data Center Bridging generic netlink interface"); 51MODULE_DESCRIPTION("Data Center Bridging netlink interface");
52MODULE_LICENSE("GPL"); 52MODULE_LICENSE("GPL");
53 53
54/**************** DCB attribute policies *************************************/ 54/**************** DCB attribute policies *************************************/