diff options
Diffstat (limited to 'drivers/net/vxge/vxge-main.h')
-rw-r--r-- | drivers/net/vxge/vxge-main.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h index 953cb0ded3e1..256d5b406a67 100644 --- a/drivers/net/vxge/vxge-main.h +++ b/drivers/net/vxge/vxge-main.h | |||
@@ -305,8 +305,8 @@ struct vxge_vpath { | |||
305 | int is_configured; | 305 | int is_configured; |
306 | int is_open; | 306 | int is_open; |
307 | struct vxgedev *vdev; | 307 | struct vxgedev *vdev; |
308 | u8 (macaddr)[ETH_ALEN]; | 308 | u8 macaddr[ETH_ALEN]; |
309 | u8 (macmask)[ETH_ALEN]; | 309 | u8 macmask[ETH_ALEN]; |
310 | 310 | ||
311 | #define VXGE_MAX_LEARN_MAC_ADDR_CNT 2048 | 311 | #define VXGE_MAX_LEARN_MAC_ADDR_CNT 2048 |
312 | /* mac addresses currently programmed into NIC */ | 312 | /* mac addresses currently programmed into NIC */ |
@@ -420,10 +420,8 @@ struct vxge_tx_priv { | |||
420 | mod_timer(&timer, (jiffies + exp)); \ | 420 | mod_timer(&timer, (jiffies + exp)); \ |
421 | } while (0); | 421 | } while (0); |
422 | 422 | ||
423 | extern void vxge_initialize_ethtool_ops(struct net_device *ndev); | 423 | void vxge_initialize_ethtool_ops(struct net_device *ndev); |
424 | |||
425 | enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev); | 424 | enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev); |
426 | |||
427 | int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override); | 425 | int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override); |
428 | 426 | ||
429 | /** | 427 | /** |