cxgb3: fix GRO checksum check

[safe/jmp/linux-2.6] / drivers / net / ixgbe / ixgbe_dcb.c

diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c
index 2a60c89..9aea4f0 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ixgbe/ixgbe_dcb.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -31,6 +31,7 @@
 #include "ixgbe_type.h"
 #include "ixgbe_dcb.h"
 #include "ixgbe_dcb_82598.h"
+#include "ixgbe_dcb_82599.h"
 
 /**
  * ixgbe_dcb_config - Struct containing DCB settings.
@@ -215,6 +216,8 @@ s32 ixgbe_dcb_get_tc_stats(struct ixgbe_hw *hw, struct ixgbe_hw_stats *stats,
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_get_tc_stats_82598(hw, stats, tc_count);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_get_tc_stats_82599(hw, stats, tc_count);
        return ret;
 }
 
@@ -232,6 +235,8 @@ s32 ixgbe_dcb_get_pfc_stats(struct ixgbe_hw *hw, struct ixgbe_hw_stats *stats,
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_get_pfc_stats_82598(hw, stats, tc_count);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_get_pfc_stats_82599(hw, stats, tc_count);
        return ret;
 }
 
@@ -248,6 +253,8 @@ s32 ixgbe_dcb_config_rx_arbiter(struct ixgbe_hw *hw,
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_config_rx_arbiter_82598(hw, dcb_config);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_config_rx_arbiter_82599(hw, dcb_config);
        return ret;
 }
 
@@ -264,6 +271,8 @@ s32 ixgbe_dcb_config_tx_desc_arbiter(struct ixgbe_hw *hw,
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_config_tx_desc_arbiter_82598(hw, dcb_config);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_config_tx_desc_arbiter_82599(hw, dcb_config);
        return ret;
 }
 
@@ -280,6 +289,8 @@ s32 ixgbe_dcb_config_tx_data_arbiter(struct ixgbe_hw *hw,
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_config_tx_data_arbiter_82598(hw, dcb_config);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_config_tx_data_arbiter_82599(hw, dcb_config);
        return ret;
 }
 
@@ -296,6 +307,8 @@ s32 ixgbe_dcb_config_pfc(struct ixgbe_hw *hw,
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_config_pfc_82598(hw, dcb_config);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_config_pfc_82599(hw, dcb_config);
        return ret;
 }
 
@@ -311,6 +324,8 @@ s32 ixgbe_dcb_config_tc_stats(struct ixgbe_hw *hw)
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_config_tc_stats_82598(hw);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_config_tc_stats_82599(hw);
        return ret;
 }
 
@@ -327,6 +342,8 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
        s32 ret = 0;
        if (hw->mac.type == ixgbe_mac_82598EB)
                ret = ixgbe_dcb_hw_config_82598(hw, dcb_config);
+       else if (hw->mac.type == ixgbe_mac_82599EB)
+               ret = ixgbe_dcb_hw_config_82599(hw, dcb_config);
        return ret;
 }