Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / ixgbe / ixgbe_dcb.h

diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h
index 944838f..e85826a 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_dcb.h
+++ b/drivers/net/ixgbe/ixgbe_dcb.h
@@ -123,11 +123,6 @@ struct tc_configuration {
        u8 tc; /* Traffic class (TC) */
 };
 
-enum dcb_rx_pba_cfg {
-       pba_equal,     /* PBA[0-7] each use 64KB FIFO */
-       pba_80_48      /* PBA[0-3] each use 80KB, PBA[4-7] each use 48KB */
-};
-
 struct dcb_num_tcs {
        u8 pg_tcs;
        u8 pfc_tcs;
@@ -140,8 +135,6 @@ struct ixgbe_dcb_config {
        u8     bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */
        bool   pfc_mode_enable;
 
-       enum dcb_rx_pba_cfg rx_pba_cfg;
-
        u32  dcb_cfg_version; /* Not used...OS-specific? */
        u32  link_speed; /* For bandwidth allocation validation purpose */
 };