diff options
Diffstat (limited to 'drivers/net/ethernet/neterion/vxge/vxge-main.c')
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-main.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index bb5770fc6503..7c87105ca049 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c | |||
@@ -3372,9 +3372,8 @@ static const struct net_device_ops vxge_netdev_ops = { | |||
3372 | }; | 3372 | }; |
3373 | 3373 | ||
3374 | static int vxge_device_register(struct __vxge_hw_device *hldev, | 3374 | static int vxge_device_register(struct __vxge_hw_device *hldev, |
3375 | struct vxge_config *config, | 3375 | struct vxge_config *config, int high_dma, |
3376 | int high_dma, int no_of_vpath, | 3376 | int no_of_vpath, struct vxgedev **vdev_out) |
3377 | struct vxgedev **vdev_out) | ||
3378 | { | 3377 | { |
3379 | struct net_device *ndev; | 3378 | struct net_device *ndev; |
3380 | enum vxge_hw_status status = VXGE_HW_OK; | 3379 | enum vxge_hw_status status = VXGE_HW_OK; |
@@ -3672,9 +3671,8 @@ static void verify_bandwidth(void) | |||
3672 | /* | 3671 | /* |
3673 | * Vpath configuration | 3672 | * Vpath configuration |
3674 | */ | 3673 | */ |
3675 | static int vxge_config_vpaths( | 3674 | static int vxge_config_vpaths(struct vxge_hw_device_config *device_config, |
3676 | struct vxge_hw_device_config *device_config, | 3675 | u64 vpath_mask, struct vxge_config *config_param) |
3677 | u64 vpath_mask, struct vxge_config *config_param) | ||
3678 | { | 3676 | { |
3679 | int i, no_of_vpaths = 0, default_no_vpath = 0, temp; | 3677 | int i, no_of_vpaths = 0, default_no_vpath = 0, temp; |
3680 | u32 txdl_size, txdl_per_memblock; | 3678 | u32 txdl_size, txdl_per_memblock; |
@@ -3859,9 +3857,8 @@ static int vxge_config_vpaths( | |||
3859 | } | 3857 | } |
3860 | 3858 | ||
3861 | /* initialize device configuratrions */ | 3859 | /* initialize device configuratrions */ |
3862 | static void vxge_device_config_init( | 3860 | static void vxge_device_config_init(struct vxge_hw_device_config *device_config, |
3863 | struct vxge_hw_device_config *device_config, | 3861 | int *intr_type) |
3864 | int *intr_type) | ||
3865 | { | 3862 | { |
3866 | /* Used for CQRQ/SRQ. */ | 3863 | /* Used for CQRQ/SRQ. */ |
3867 | device_config->dma_blockpool_initial = | 3864 | device_config->dma_blockpool_initial = |