Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122141
b: refs/heads/master
c: 7a6b6f5
h: refs/heads/master
i:
  122139: 05687c3
v: v3
  • Loading branch information
Jeff Kirsher authored and David S. Miller committed Nov 25, 2008
1 parent 5e3e4ef commit 87c4aec
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 411c41eea58bd3500cf897e2c27dd5330935a3a8
refs/heads/master: 7a6b6f515f77d1c62a2f383b6dce18cb0af0cf4f
4 changes: 2 additions & 2 deletions trunk/drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/ixgbe/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion trunk/drivers/net/ixgbe/ixgbe.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/net/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand All @@ -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];
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions trunk/include/linux/netdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

#include <net/net_namespace.h>
#include <net/dsa.h>
#ifdef CONFIG_DCBNL
#ifdef CONFIG_DCB
#include <net/dcbnl.h>
#endif

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ obj-$(CONFIG_NETLABEL) += netlabel/
obj-$(CONFIG_IUCV) += iucv/
obj-$(CONFIG_RFKILL) += rfkill/
obj-$(CONFIG_NET_9P) += 9p/
ifeq ($(CONFIG_DCBNL),y)
obj-$(CONFIG_DCB) += dcb/
ifneq ($(CONFIG_DCB),)
obj-y += dcb/
endif

ifeq ($(CONFIG_NET),y)
Expand Down
24 changes: 17 additions & 7 deletions trunk/net/dcb/Kconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
config DCB
tristate "Data Center Bridging support"

config DCBNL
bool "Data Center Bridging netlink interface support"
depends on DCB
bool "Data Center Bridging support"
default n
---help---
This option turns on the netlink interface
(dcbnl) for Data Center Bridging capable devices.
This enables support for configuring Data Center Bridging (DCB)
features on DCB capable Ethernet adapters via rtnetlink. Say 'Y'
if you have a DCB capable Ethernet adapter which supports this
interface and you are connected to a DCB capable switch.

DCB is a collection of Ethernet enhancements which allow DCB capable
NICs and switches to support network traffic with differing
requirements (highly reliable, no drops vs. best effort vs. low
latency) to co-exist on Ethernet.

DCB features include:
Enhanced Transmission Selection (aka Priority Grouping) - provides a
framework for assigning bandwidth guarantees to traffic classes.
Priority-based Flow Control (PFC) - a MAC control pause frame which
works at the granularity of the 802.1p priority instead of the
link (802.3x).

If unsure, say N.
2 changes: 1 addition & 1 deletion trunk/net/dcb/dcbnl.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/

MODULE_AUTHOR("Lucy Liu, <lucy.liu@intel.com>");
MODULE_DESCRIPTION("Data Center Bridging generic netlink interface");
MODULE_DESCRIPTION("Data Center Bridging netlink interface");
MODULE_LICENSE("GPL");

/**************** DCB attribute policies *************************************/
Expand Down

0 comments on commit 87c4aec

Please sign in to comment.