net: add DCNA attribute to the BCN interface for DCB

[net-next-2.6.git] / drivers / net / ixgbe / ixgbe_dcb_nl.c

diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index 615c2803202a3d829c6797f50999cf9deb685715..8ac639d0da03b29832e676a67d5ea1847b7cb3a2 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -93,6 +93,8 @@ int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
                dst_dcb_cfg->bcn.rp_admin_mode[i - DCB_BCN_ATTR_RP_0] =
                        src_dcb_cfg->bcn.rp_admin_mode[i - DCB_BCN_ATTR_RP_0];
        }
+       dst_dcb_cfg->bcn.bcna_option[0] = src_dcb_cfg->bcn.bcna_option[0];
+       dst_dcb_cfg->bcn.bcna_option[1] = src_dcb_cfg->bcn.bcna_option[1];
        dst_dcb_cfg->bcn.rp_alpha = src_dcb_cfg->bcn.rp_alpha;
        dst_dcb_cfg->bcn.rp_beta = src_dcb_cfg->bcn.rp_beta;
        dst_dcb_cfg->bcn.rp_gd = src_dcb_cfg->bcn.rp_gd;
@@ -124,39 +126,45 @@ static u16 ixgbe_dcb_select_queue(struct net_device *dev, struct sk_buff *skb)
        return 0;
 }
 
-static void ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
+static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
 {
+       u8 err = 0;
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
        DPRINTK(DRV, INFO, "Set DCB Admin Mode.\n");
 
        if (state > 0) {
                /* Turn on DCB */
-               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                       return;
-               } else {
-                       if (netif_running(netdev))
-                               netdev->stop(netdev);
-                       ixgbe_reset_interrupt_capability(adapter);
-                       ixgbe_napi_del_all(adapter);
-                       kfree(adapter->tx_ring);
-                       kfree(adapter->rx_ring);
-                       adapter->tx_ring = NULL;
-                       adapter->rx_ring = NULL;
-                       netdev->select_queue = &ixgbe_dcb_select_queue;
+               if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
+                       goto out;
 
-                       adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
-                       adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
-                       ixgbe_init_interrupt_scheme(adapter);
-                       ixgbe_napi_add_all(adapter);
-                       if (netif_running(netdev))
-                               netdev->open(netdev);
+               if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
+                       DPRINTK(DRV, ERR, "Enable failed, needs MSI-X\n");
+                       err = 1;
+                       goto out;
                }
+
+               if (netif_running(netdev))
+                       netdev->netdev_ops->ndo_stop(netdev);
+               ixgbe_reset_interrupt_capability(adapter);
+               ixgbe_napi_del_all(adapter);
+               kfree(adapter->tx_ring);
+               kfree(adapter->rx_ring);
+               adapter->tx_ring = NULL;
+               adapter->rx_ring = NULL;
+               netdev->select_queue = &ixgbe_dcb_select_queue;
+
+               adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
+               adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
+               ixgbe_init_interrupt_scheme(adapter);
+               ixgbe_napi_add_all(adapter);
+               if (netif_running(netdev))
+                       netdev->netdev_ops->ndo_open(netdev);
        } else {
                /* Turn off DCB */
                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
                        if (netif_running(netdev))
-                               netdev->stop(netdev);
+                               netdev->netdev_ops->ndo_stop(netdev);
                        ixgbe_reset_interrupt_capability(adapter);
                        ixgbe_napi_del_all(adapter);
                        kfree(adapter->tx_ring);
@@ -170,11 +178,11 @@ static void ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                        ixgbe_init_interrupt_scheme(adapter);
                        ixgbe_napi_add_all(adapter);
                        if (netif_running(netdev))
-                               netdev->open(netdev);
-               } else {
-                       return;
+                               netdev->netdev_ops->ndo_open(netdev);
                }
        }
+out:
+       return err;
 }
 
 static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev,
@@ -451,6 +459,12 @@ static void ixgbe_dcbnl_getbcncfg(struct net_device *netdev, int enum_index,
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
        switch (enum_index) {
+       case DCB_BCN_ATTR_BCNA_0:
+               *setting = adapter->dcb_cfg.bcn.bcna_option[0];
+               break;
+       case DCB_BCN_ATTR_BCNA_1:
+               *setting = adapter->dcb_cfg.bcn.bcna_option[1];
+               break;
        case DCB_BCN_ATTR_ALPHA:
                *setting = adapter->dcb_cfg.bcn.rp_alpha;
                break;
@@ -510,6 +524,18 @@ static void ixgbe_dcbnl_setbcncfg(struct net_device *netdev, int enum_index,
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
        switch (enum_index) {
+       case DCB_BCN_ATTR_BCNA_0:
+               adapter->temp_dcb_cfg.bcn.bcna_option[0] = setting;
+               if (adapter->temp_dcb_cfg.bcn.bcna_option[0] !=
+                       adapter->dcb_cfg.bcn.bcna_option[0])
+                       adapter->dcb_set_bitmap |= BIT_BCN;
+               break;
+       case DCB_BCN_ATTR_BCNA_1:
+               adapter->temp_dcb_cfg.bcn.bcna_option[1] = setting;
+               if (adapter->temp_dcb_cfg.bcn.bcna_option[1] !=
+                       adapter->dcb_cfg.bcn.bcna_option[1])
+                       adapter->dcb_set_bitmap |= BIT_BCN;
+               break;
        case DCB_BCN_ATTR_ALPHA:
                adapter->temp_dcb_cfg.bcn.rp_alpha = setting;
                if (adapter->temp_dcb_cfg.bcn.rp_alpha !=