diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-11 21:09:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-11 21:09:04 -0800 |
| commit | 58bb4bd0e0b1ab560a7320a760141ba52db68791 (patch) | |
| tree | 47ca0cfe15778e851c7515e5eac1f9df0593c90c /drivers/net/ixgbe/ixgbe.h | |
| parent | dd68153def6b890a23288776cbd5bd2bad223a3f (diff) | |
| parent | 1b1c0a489c1dcc1fa640c13404ca69e7beae07d9 (diff) | |
| download | talos-op-linux-58bb4bd0e0b1ab560a7320a760141ba52db68791.tar.gz talos-op-linux-58bb4bd0e0b1ab560a7320a760141ba52db68791.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/ixgbe/ixgbe.h')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h index 3b8c92463617..12769b58c2e7 100644 --- a/drivers/net/ixgbe/ixgbe.h +++ b/drivers/net/ixgbe/ixgbe.h @@ -334,6 +334,10 @@ struct ixgbe_adapter { u16 bd_number; struct work_struct reset_task; struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS]; + + /* DCB parameters */ + struct ieee_pfc *ixgbe_ieee_pfc; + struct ieee_ets *ixgbe_ieee_ets; struct ixgbe_dcb_config dcb_cfg; struct ixgbe_dcb_config temp_dcb_cfg; u8 dcb_set_bitmap; @@ -521,7 +525,6 @@ extern void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *, extern void ixgbe_alloc_rx_buffers(struct ixgbe_ring *, u16); extern void ixgbe_write_eitr(struct ixgbe_q_vector *); extern int ethtool_ioctl(struct ifreq *ifr); -extern u8 ixgbe_dcb_txq_to_tc(struct ixgbe_adapter *adapter, u8 index); extern s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw); extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc); extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc); |
