Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / include / linux / qed / qed_if.h

diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h
index d4a32e8..1f7599c 100644 (file)
--- a/include/linux/qed/qed_if.h
+++ b/include/linux/qed/qed_if.h
@@ -80,7 +80,7 @@ struct qed_dev_info {
        u8              num_hwfns;
 
        u8              hw_mac[ETH_ALEN];
-       bool            is_mf;
+       bool            is_mf_default;
 
        /* FW version */
        u16             fw_major;
@@ -360,6 +360,12 @@ enum DP_MODULE {
        /* to be added...up to 0x8000000 */
 };
 
+enum qed_mf_mode {
+       QED_MF_DEFAULT,
+       QED_MF_OVLAN,
+       QED_MF_NPAR,
+};
+
 struct qed_eth_stats {
        u64     no_buff_discards;
        u64     packet_too_big_discard;
@@ -440,6 +446,12 @@ struct qed_eth_stats {
 #define RX_PI           0
 #define TX_PI(tc)       (RX_PI + 1 + tc)
 
+struct qed_sb_cnt_info {
+       int     sb_cnt;
+       int     sb_iov_cnt;
+       int     sb_free_blk;
+};
+
 static inline u16 qed_sb_update_sb_idx(struct qed_sb_info *sb_info)
 {
        u32 prod = 0;