diff options
Diffstat (limited to 'drivers/net/qlge/qlge_main.c')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 49bfa5813068..5bb311945436 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -660,7 +660,7 @@ static void ql_disable_interrupts(struct ql_adapter *qdev) | |||
660 | /* If we're running with multiple MSI-X vectors then we enable on the fly. | 660 | /* If we're running with multiple MSI-X vectors then we enable on the fly. |
661 | * Otherwise, we may have multiple outstanding workers and don't want to | 661 | * Otherwise, we may have multiple outstanding workers and don't want to |
662 | * enable until the last one finishes. In this case, the irq_cnt gets | 662 | * enable until the last one finishes. In this case, the irq_cnt gets |
663 | * incremented everytime we queue a worker and decremented everytime | 663 | * incremented every time we queue a worker and decremented every time |
664 | * a worker finishes. Once it hits zero we enable the interrupt. | 664 | * a worker finishes. Once it hits zero we enable the interrupt. |
665 | */ | 665 | */ |
666 | u32 ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr) | 666 | u32 ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr) |
@@ -3299,7 +3299,7 @@ msi: | |||
3299 | * will service it. An example would be if there are | 3299 | * will service it. An example would be if there are |
3300 | * 2 vectors (so 2 RSS rings) and 8 TX completion rings. | 3300 | * 2 vectors (so 2 RSS rings) and 8 TX completion rings. |
3301 | * This would mean that vector 0 would service RSS ring 0 | 3301 | * This would mean that vector 0 would service RSS ring 0 |
3302 | * and TX competion rings 0,1,2 and 3. Vector 1 would | 3302 | * and TX completion rings 0,1,2 and 3. Vector 1 would |
3303 | * service RSS ring 1 and TX completion rings 4,5,6 and 7. | 3303 | * service RSS ring 1 and TX completion rings 4,5,6 and 7. |
3304 | */ | 3304 | */ |
3305 | static void ql_set_tx_vect(struct ql_adapter *qdev) | 3305 | static void ql_set_tx_vect(struct ql_adapter *qdev) |
@@ -4152,7 +4152,7 @@ static int ql_change_rx_buffers(struct ql_adapter *qdev) | |||
4152 | int i, status; | 4152 | int i, status; |
4153 | u32 lbq_buf_len; | 4153 | u32 lbq_buf_len; |
4154 | 4154 | ||
4155 | /* Wait for an oustanding reset to complete. */ | 4155 | /* Wait for an outstanding reset to complete. */ |
4156 | if (!test_bit(QL_ADAPTER_UP, &qdev->flags)) { | 4156 | if (!test_bit(QL_ADAPTER_UP, &qdev->flags)) { |
4157 | int i = 3; | 4157 | int i = 3; |
4158 | while (i-- && !test_bit(QL_ADAPTER_UP, &qdev->flags)) { | 4158 | while (i-- && !test_bit(QL_ADAPTER_UP, &qdev->flags)) { |
@@ -4281,7 +4281,7 @@ static void qlge_set_multicast_list(struct net_device *ndev) | |||
4281 | if (ql_set_routing_reg | 4281 | if (ql_set_routing_reg |
4282 | (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 1)) { | 4282 | (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 1)) { |
4283 | netif_err(qdev, hw, qdev->ndev, | 4283 | netif_err(qdev, hw, qdev->ndev, |
4284 | "Failed to set promiscous mode.\n"); | 4284 | "Failed to set promiscuous mode.\n"); |
4285 | } else { | 4285 | } else { |
4286 | set_bit(QL_PROMISCUOUS, &qdev->flags); | 4286 | set_bit(QL_PROMISCUOUS, &qdev->flags); |
4287 | } | 4287 | } |
@@ -4291,7 +4291,7 @@ static void qlge_set_multicast_list(struct net_device *ndev) | |||
4291 | if (ql_set_routing_reg | 4291 | if (ql_set_routing_reg |
4292 | (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 0)) { | 4292 | (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 0)) { |
4293 | netif_err(qdev, hw, qdev->ndev, | 4293 | netif_err(qdev, hw, qdev->ndev, |
4294 | "Failed to clear promiscous mode.\n"); | 4294 | "Failed to clear promiscuous mode.\n"); |
4295 | } else { | 4295 | } else { |
4296 | clear_bit(QL_PROMISCUOUS, &qdev->flags); | 4296 | clear_bit(QL_PROMISCUOUS, &qdev->flags); |
4297 | } | 4297 | } |