diff options
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be.h')
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 644e8fed8364..4163980d6bcd 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h | |||
@@ -289,14 +289,12 @@ struct be_drv_stats { | |||
289 | 289 | ||
290 | struct be_vf_cfg { | 290 | struct be_vf_cfg { |
291 | unsigned char vf_mac_addr[ETH_ALEN]; | 291 | unsigned char vf_mac_addr[ETH_ALEN]; |
292 | u32 vf_if_handle; | 292 | int vf_if_handle; |
293 | u32 vf_pmac_id; | 293 | int vf_pmac_id; |
294 | u16 vf_vlan_tag; | 294 | u16 vf_vlan_tag; |
295 | u32 vf_tx_rate; | 295 | u32 vf_tx_rate; |
296 | }; | 296 | }; |
297 | 297 | ||
298 | #define BE_INVALID_PMAC_ID 0xffffffff | ||
299 | |||
300 | struct be_adapter { | 298 | struct be_adapter { |
301 | struct pci_dev *pdev; | 299 | struct pci_dev *pdev; |
302 | struct net_device *netdev; | 300 | struct net_device *netdev; |
@@ -347,7 +345,7 @@ struct be_adapter { | |||
347 | 345 | ||
348 | /* Ethtool knobs and info */ | 346 | /* Ethtool knobs and info */ |
349 | char fw_ver[FW_VER_LEN]; | 347 | char fw_ver[FW_VER_LEN]; |
350 | u32 if_handle; /* Used to configure filtering */ | 348 | int if_handle; /* Used to configure filtering */ |
351 | u32 pmac_id; /* MAC addr handle used by BE card */ | 349 | u32 pmac_id; /* MAC addr handle used by BE card */ |
352 | u32 beacon_state; /* for set_phys_id */ | 350 | u32 beacon_state; /* for set_phys_id */ |
353 | 351 | ||