diff options
| -rw-r--r-- | drivers/net/via-velocity.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index c93f58f5c6f2..133069738ba0 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -1877,13 +1877,12 @@ static void velocity_error(struct velocity_info *vptr, int status) | |||
| 1877 | /** | 1877 | /** |
| 1878 | * tx_srv - transmit interrupt service | 1878 | * tx_srv - transmit interrupt service |
| 1879 | * @vptr; Velocity | 1879 | * @vptr; Velocity |
| 1880 | * @status: | ||
| 1881 | * | 1880 | * |
| 1882 | * Scan the queues looking for transmitted packets that | 1881 | * Scan the queues looking for transmitted packets that |
| 1883 | * we can complete and clean up. Update any statistics as | 1882 | * we can complete and clean up. Update any statistics as |
| 1884 | * necessary/ | 1883 | * necessary/ |
| 1885 | */ | 1884 | */ |
| 1886 | static int velocity_tx_srv(struct velocity_info *vptr, u32 status) | 1885 | static int velocity_tx_srv(struct velocity_info *vptr) |
| 1887 | { | 1886 | { |
| 1888 | struct tx_desc *td; | 1887 | struct tx_desc *td; |
| 1889 | int qnum; | 1888 | int qnum; |
| @@ -2090,14 +2089,12 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx) | |||
| 2090 | /** | 2089 | /** |
| 2091 | * velocity_rx_srv - service RX interrupt | 2090 | * velocity_rx_srv - service RX interrupt |
| 2092 | * @vptr: velocity | 2091 | * @vptr: velocity |
| 2093 | * @status: adapter status (unused) | ||
| 2094 | * | 2092 | * |
| 2095 | * Walk the receive ring of the velocity adapter and remove | 2093 | * Walk the receive ring of the velocity adapter and remove |
| 2096 | * any received packets from the receive queue. Hand the ring | 2094 | * any received packets from the receive queue. Hand the ring |
| 2097 | * slots back to the adapter for reuse. | 2095 | * slots back to the adapter for reuse. |
| 2098 | */ | 2096 | */ |
| 2099 | static int velocity_rx_srv(struct velocity_info *vptr, int status, | 2097 | static int velocity_rx_srv(struct velocity_info *vptr, int budget_left) |
| 2100 | int budget_left) | ||
| 2101 | { | 2098 | { |
| 2102 | struct net_device_stats *stats = &vptr->dev->stats; | 2099 | struct net_device_stats *stats = &vptr->dev->stats; |
| 2103 | int rd_curr = vptr->rx.curr; | 2100 | int rd_curr = vptr->rx.curr; |
| @@ -2165,10 +2162,10 @@ static int velocity_poll(struct napi_struct *napi, int budget) | |||
| 2165 | * Do rx and tx twice for performance (taken from the VIA | 2162 | * Do rx and tx twice for performance (taken from the VIA |
| 2166 | * out-of-tree driver). | 2163 | * out-of-tree driver). |
| 2167 | */ | 2164 | */ |
| 2168 | rx_done = velocity_rx_srv(vptr, isr_status, budget / 2); | 2165 | rx_done = velocity_rx_srv(vptr, budget / 2); |
| 2169 | velocity_tx_srv(vptr, isr_status); | 2166 | velocity_tx_srv(vptr); |
| 2170 | rx_done += velocity_rx_srv(vptr, isr_status, budget - rx_done); | 2167 | rx_done += velocity_rx_srv(vptr, budget - rx_done); |
| 2171 | velocity_tx_srv(vptr, isr_status); | 2168 | velocity_tx_srv(vptr); |
| 2172 | 2169 | ||
| 2173 | spin_unlock(&vptr->lock); | 2170 | spin_unlock(&vptr->lock); |
| 2174 | 2171 | ||
| @@ -3100,7 +3097,7 @@ static int velocity_resume(struct pci_dev *pdev) | |||
| 3100 | velocity_init_registers(vptr, VELOCITY_INIT_WOL); | 3097 | velocity_init_registers(vptr, VELOCITY_INIT_WOL); |
| 3101 | mac_disable_int(vptr->mac_regs); | 3098 | mac_disable_int(vptr->mac_regs); |
| 3102 | 3099 | ||
| 3103 | velocity_tx_srv(vptr, 0); | 3100 | velocity_tx_srv(vptr); |
| 3104 | 3101 | ||
| 3105 | for (i = 0; i < vptr->tx.numq; i++) { | 3102 | for (i = 0; i < vptr->tx.numq; i++) { |
| 3106 | if (vptr->tx.used[i]) | 3103 | if (vptr->tx.used[i]) |
