diff options
author | Wei Liu <wei.liu2@citrix.com> | 2013-05-01 20:43:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-02 16:50:08 -0400 |
commit | ac69c26e7accb04ae2cb9ab0872068983a42b3c8 (patch) | |
tree | 637729032495359ddb2df58950105c202d0fa688 /drivers/net/xen-netback | |
parent | c2bba3dfc16e625e73f986a21110cb784cddd30a (diff) |
xen-netback: remove redundent parameter in netbk_count_requests
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>
Diffstat (limited to 'drivers/net/xen-netback')
-rw-r--r-- | drivers/net/xen-netback/netback.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index a2865f17c667..c44772d6bba0 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c | |||
@@ -928,7 +928,6 @@ static void netbk_fatal_tx_err(struct xenvif *vif) | |||
928 | 928 | ||
929 | static int netbk_count_requests(struct xenvif *vif, | 929 | static int netbk_count_requests(struct xenvif *vif, |
930 | struct xen_netif_tx_request *first, | 930 | struct xen_netif_tx_request *first, |
931 | RING_IDX first_idx, | ||
932 | struct xen_netif_tx_request *txp, | 931 | struct xen_netif_tx_request *txp, |
933 | int work_to_do) | 932 | int work_to_do) |
934 | { | 933 | { |
@@ -1005,7 +1004,7 @@ static int netbk_count_requests(struct xenvif *vif, | |||
1005 | } while ((txp++)->flags & XEN_NETTXF_more_data); | 1004 | } while ((txp++)->flags & XEN_NETTXF_more_data); |
1006 | 1005 | ||
1007 | if (drop_err) { | 1006 | if (drop_err) { |
1008 | netbk_tx_err(vif, first, first_idx + slots); | 1007 | netbk_tx_err(vif, first, cons + slots); |
1009 | return drop_err; | 1008 | return drop_err; |
1010 | } | 1009 | } |
1011 | 1010 | ||
@@ -1470,8 +1469,7 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk) | |||
1470 | continue; | 1469 | continue; |
1471 | } | 1470 | } |
1472 | 1471 | ||
1473 | ret = netbk_count_requests(vif, &txreq, idx, | 1472 | ret = netbk_count_requests(vif, &txreq, txfrags, work_to_do); |
1474 | txfrags, work_to_do); | ||
1475 | if (unlikely(ret < 0)) | 1473 | if (unlikely(ret < 0)) |
1476 | continue; | 1474 | continue; |
1477 | 1475 | ||