xen-netback: remove redundent parameter in netbk_count_requests

commit ac69c26e7accb04ae2cb9ab0872068983a42b3c8 upstream.

Tracking down from the caller, first_idx is always equal to vif->tx.req_cons.
Remove it to avoid confusion.

Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 87dd2bf..8772d1e 100644 (file)
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -900,7 +900,6 @@ static void netbk_fatal_tx_err(struct xenvif *vif)
 
 static int netbk_count_requests(struct xenvif *vif,
                                struct xen_netif_tx_request *first,
-                               RING_IDX first_idx,
                                struct xen_netif_tx_request *txp,
                                int work_to_do)
 {
@@ -977,7 +976,7 @@ static int netbk_count_requests(struct xenvif *vif,
        } while ((txp++)->flags & XEN_NETTXF_more_data);
 
        if (drop_err) {
-               netbk_tx_err(vif, first, first_idx + slots);
+               netbk_tx_err(vif, first, cons + slots);
                return drop_err;
        }
 
@@ -1447,8 +1446,7 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
                                continue;
                }
 
-               ret = netbk_count_requests(vif, &txreq, idx,
-                                          txfrags, work_to_do);
+               ret = netbk_count_requests(vif, &txreq, txfrags, work_to_do);
                if (unlikely(ret < 0))
                        continue;