X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_pmd_vmxnet3%2Fvmxnet3_ethdev.h;h=0941cfc6adbf6447a8dce33b39292591350134d1;hb=3658eb95fe65bf42bdfb80b0a7ecd1e4d484bf5f;hp=3b9c7b076b7a0541e0aafb94f4807f0314ae7a3f;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h index 3b9c7b076b..0941cfc6ad 100644 --- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h +++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.h @@ -36,7 +36,7 @@ #ifdef RTE_LIBRTE_VMXNET3_DEBUG_DRIVER #define VMXNET3_ASSERT(x) do { \ - if(!(x)) rte_panic("VMXNET3: x"); \ + if (!(x)) rte_panic("VMXNET3: x"); \ } while(0) #endif @@ -64,16 +64,16 @@ /* RSS configuration structure - shared with device through GPA */ typedef struct VMXNET3_RSSConf { - uint16_t hashType; - uint16_t hashFunc; - uint16_t hashKeySize; - uint16_t indTableSize; - uint8_t hashKey[VMXNET3_RSS_MAX_KEY_SIZE]; - /* - * indTable is only element that can be changed without - * device quiesce-reset-update-activation cycle - */ - uint8_t indTable[VMXNET3_RSS_MAX_IND_TABLE_SIZE]; + uint16_t hashType; + uint16_t hashFunc; + uint16_t hashKeySize; + uint16_t indTableSize; + uint8_t hashKey[VMXNET3_RSS_MAX_KEY_SIZE]; + /* + * indTable is only element that can be changed without + * device quiesce-reset-update-activation cycle + */ + uint8_t indTable[VMXNET3_RSS_MAX_IND_TABLE_SIZE]; } VMXNET3_RSSConf; typedef @@ -117,16 +117,6 @@ struct vmxnet3_hw { vmxnet3_mf_table_t *mf_table; }; -/* - * Structure to store private data for each driver instance (for each port). - */ -struct vmxnet3_adapter { - struct vmxnet3_hw hw; -}; - -#define VMXNET3_DEV_PRIVATE_TO_HW(adapter)\ - (&((struct vmxnet3_adapter *)adapter)->hw) - #define VMXNET3_GET_ADDR_LO(reg) ((uint32_t)(reg)) #define VMXNET3_GET_ADDR_HI(reg) ((uint32_t)(((uint64_t)(reg)) >> 32)) @@ -134,7 +124,7 @@ struct vmxnet3_adapter { #define VMXNET3_PCI_REG(reg) (*((volatile uint32_t *)(reg))) -static inline uint32_t vmxnet3_read_addr(volatile void* addr) +static inline uint32_t vmxnet3_read_addr(volatile void *addr) { return VMXNET3_PCI_REG(addr); }