diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2008-11-25 04:02:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 04:02:08 -0500 |
commit | 7a6b6f515f77d1c62a2f383b6dce18cb0af0cf4f (patch) | |
tree | eed74f9344c3f65beb5386b93eca05526be8a914 /drivers/net/ixgbe/ixgbe_main.c | |
parent | 411c41eea58bd3500cf897e2c27dd5330935a3a8 (diff) |
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 | ||