diff options
Diffstat (limited to 'drivers/net/vxge')
-rw-r--r-- | drivers/net/vxge/vxge-config.c | 2 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-main.c | 8 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-traffic.c | 4 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-traffic.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index e74e4b42592d..401bebf59502 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/drivers/net/vxge/vxge-config.c | |||
@@ -187,7 +187,7 @@ vxge_hw_vpath_fw_api(struct __vxge_hw_virtualpath *vpath, u32 action, | |||
187 | VXGE_HW_DEF_DEVICE_POLL_MILLIS); | 187 | VXGE_HW_DEF_DEVICE_POLL_MILLIS); |
188 | 188 | ||
189 | /* The __vxge_hw_device_register_poll can udelay for a significant | 189 | /* The __vxge_hw_device_register_poll can udelay for a significant |
190 | * amount of time, blocking other proccess from the CPU. If it delays | 190 | * amount of time, blocking other process from the CPU. If it delays |
191 | * for ~5secs, a NMI error can occur. A way around this is to give up | 191 | * for ~5secs, a NMI error can occur. A way around this is to give up |
192 | * the processor via msleep, but this is not allowed is under lock. | 192 | * the processor via msleep, but this is not allowed is under lock. |
193 | * So, only allow it to sleep for ~4secs if open. Otherwise, delay for | 193 | * So, only allow it to sleep for ~4secs if open. Otherwise, delay for |
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index 395423aeec00..aff68c1118d4 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c | |||
@@ -2282,7 +2282,7 @@ vxge_alarm_msix_handle(int irq, void *dev_id) | |||
2282 | VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID; | 2282 | VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID; |
2283 | 2283 | ||
2284 | for (i = 0; i < vdev->no_of_vpath; i++) { | 2284 | for (i = 0; i < vdev->no_of_vpath; i++) { |
2285 | /* Reduce the chance of loosing alarm interrupts by masking | 2285 | /* Reduce the chance of losing alarm interrupts by masking |
2286 | * the vector. A pending bit will be set if an alarm is | 2286 | * the vector. A pending bit will be set if an alarm is |
2287 | * generated and on unmask the interrupt will be fired. | 2287 | * generated and on unmask the interrupt will be fired. |
2288 | */ | 2288 | */ |
@@ -2788,7 +2788,7 @@ static int vxge_open(struct net_device *dev) | |||
2788 | } | 2788 | } |
2789 | 2789 | ||
2790 | /* Enable vpath to sniff all unicast/multicast traffic that not | 2790 | /* Enable vpath to sniff all unicast/multicast traffic that not |
2791 | * addressed to them. We allow promiscous mode for PF only | 2791 | * addressed to them. We allow promiscuous mode for PF only |
2792 | */ | 2792 | */ |
2793 | 2793 | ||
2794 | val64 = 0; | 2794 | val64 = 0; |
@@ -2890,7 +2890,7 @@ out0: | |||
2890 | return ret; | 2890 | return ret; |
2891 | } | 2891 | } |
2892 | 2892 | ||
2893 | /* Loop throught the mac address list and delete all the entries */ | 2893 | /* Loop through the mac address list and delete all the entries */ |
2894 | static void vxge_free_mac_add_list(struct vxge_vpath *vpath) | 2894 | static void vxge_free_mac_add_list(struct vxge_vpath *vpath) |
2895 | { | 2895 | { |
2896 | 2896 | ||
@@ -2957,7 +2957,7 @@ static int do_vxge_close(struct net_device *dev, int do_io) | |||
2957 | val64); | 2957 | val64); |
2958 | } | 2958 | } |
2959 | 2959 | ||
2960 | /* Remove the function 0 from promiscous mode */ | 2960 | /* Remove the function 0 from promiscuous mode */ |
2961 | vxge_hw_mgmt_reg_write(vdev->devh, | 2961 | vxge_hw_mgmt_reg_write(vdev->devh, |
2962 | vxge_hw_mgmt_reg_type_mrpcim, | 2962 | vxge_hw_mgmt_reg_type_mrpcim, |
2963 | 0, | 2963 | 0, |
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c index 8674f331311c..2638b8d97b8f 100644 --- a/drivers/net/vxge/vxge-traffic.c +++ b/drivers/net/vxge/vxge-traffic.c | |||
@@ -1111,7 +1111,7 @@ void vxge_hw_channel_dtr_free(struct __vxge_hw_channel *channel, void *dtrh) | |||
1111 | * vxge_hw_channel_dtr_count | 1111 | * vxge_hw_channel_dtr_count |
1112 | * @channel: Channel handle. Obtained via vxge_hw_channel_open(). | 1112 | * @channel: Channel handle. Obtained via vxge_hw_channel_open(). |
1113 | * | 1113 | * |
1114 | * Retreive number of DTRs available. This function can not be called | 1114 | * Retrieve number of DTRs available. This function can not be called |
1115 | * from data path. ring_initial_replenishi() is the only user. | 1115 | * from data path. ring_initial_replenishi() is the only user. |
1116 | */ | 1116 | */ |
1117 | int vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel) | 1117 | int vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel) |
@@ -2060,7 +2060,7 @@ enum vxge_hw_status vxge_hw_vpath_promisc_enable( | |||
2060 | 2060 | ||
2061 | vpath = vp->vpath; | 2061 | vpath = vp->vpath; |
2062 | 2062 | ||
2063 | /* Enable promiscous mode for function 0 only */ | 2063 | /* Enable promiscuous mode for function 0 only */ |
2064 | if (!(vpath->hldev->access_rights & | 2064 | if (!(vpath->hldev->access_rights & |
2065 | VXGE_HW_DEVICE_ACCESS_RIGHT_MRPCIM)) | 2065 | VXGE_HW_DEVICE_ACCESS_RIGHT_MRPCIM)) |
2066 | return VXGE_HW_OK; | 2066 | return VXGE_HW_OK; |
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h index 9d9dfda4c7ab..6c2fc0b72af5 100644 --- a/drivers/net/vxge/vxge-traffic.h +++ b/drivers/net/vxge/vxge-traffic.h | |||
@@ -681,7 +681,7 @@ struct vxge_hw_xmac_aggr_stats { | |||
681 | * @rx_red_discard: Count of received frames that are discarded because of RED | 681 | * @rx_red_discard: Count of received frames that are discarded because of RED |
682 | * (Random Early Discard). | 682 | * (Random Early Discard). |
683 | * @rx_xgmii_ctrl_err_cnt: Maintains a count of unexpected or misplaced control | 683 | * @rx_xgmii_ctrl_err_cnt: Maintains a count of unexpected or misplaced control |
684 | * characters occuring between times of normal data transmission | 684 | * characters occurring between times of normal data transmission |
685 | * (i.e. not included in RX_XGMII_DATA_ERR_CNT). This counter is | 685 | * (i.e. not included in RX_XGMII_DATA_ERR_CNT). This counter is |
686 | * incremented when either - | 686 | * incremented when either - |
687 | * 1) The Reconciliation Sublayer (RS) is expecting one control | 687 | * 1) The Reconciliation Sublayer (RS) is expecting one control |