ipv6: remove csummode in ip6_append_data()

[deliverable/linux.git] / drivers / net / ethernet / emulex / benet / be.h

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index c3ee9103ff4f12c11b436f018f2ac99f304a384c..ecf1a81f26e28a28e49c2b0135ce765d78932561 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -313,6 +313,11 @@ struct be_vf_cfg {
        u32 tx_rate;
 };
 
+enum vf_state {
+       ENABLED = 0,
+       ASSIGNED = 1
+};
+
 #define BE_FLAGS_LINK_STATUS_INIT              1
 #define BE_FLAGS_WORKER_SCHEDULED              (1 << 3)
 #define BE_UC_PMAC_COUNT               30
@@ -403,8 +408,9 @@ struct be_adapter {
        u32 flash_status;
        struct completion flash_compl;
 
-       u32 num_vfs;
-       u8 is_virtfn;
+       u32 num_vfs;            /* Number of VFs provisioned by PF driver */
+       u32 dev_num_vfs;        /* Number of VFs supported by HW */
+       u8 virtfn;
        struct be_vf_cfg *vf_cfg;
        bool be3_native;
        u32 sli_family;
@@ -417,8 +423,10 @@ struct be_adapter {
        u32 uc_macs;            /* Count of secondary UC MAC programmed */
 };
 
-#define be_physfn(adapter) (!adapter->is_virtfn)
+#define be_physfn(adapter)             (!adapter->virtfn)
 #define        sriov_enabled(adapter)          (adapter->num_vfs > 0)
+#define        sriov_want(adapter)             (adapter->dev_num_vfs && num_vfs && \
+                                        be_physfn(adapter))
 #define for_all_vfs(adapter, vf_cfg, i)                                        \
        for (i = 0, vf_cfg = &adapter->vf_cfg[i]; i < adapter->num_vfs; \
                i++, vf_cfg++)
@@ -547,14 +555,6 @@ static inline u8 is_udp_pkt(struct sk_buff *skb)
        return val;
 }
 
-static inline void be_check_sriov_fn_type(struct be_adapter *adapter)
-{
-       u32 sli_intf;
-
-       pci_read_config_dword(adapter->pdev, SLI_INTF_REG_OFFSET, &sli_intf);
-       adapter->is_virtfn = (sli_intf & SLI_INTF_FT_MASK) ? 1 : 0;
-}
-
 static inline void be_vf_eth_addr_generate(struct be_adapter *adapter, u8 *mac)
 {
        u32 addr;