Wei Liu
2013-Apr-30 16:50 UTC
[PATCH net-next 1/2] 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.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
drivers/net/xen-netback/netback.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c
b/drivers/net/xen-netback/netback.c
index a2865f1..c44772d 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)
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)
{
@@ -1005,7 +1004,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;
}
@@ -1470,8 +1469,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;
--
1.7.10.4
Ian Campbell
2013-May-01 10:10 UTC
Re: [PATCH net-next 1/2] xen-netback: remove redundent parameter in netbk_count_requests
On Tue, 2013-04-30 at 17:50 +0100, Wei Liu wrote:> Tracking down from the caller, first_idx is always equal to vif->tx.req_cons. > Remove it to avoid confusion. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>Acked-by: Ian Campbell <ian.campbell@citrix.com>> --- > drivers/net/xen-netback/netback.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c > index a2865f1..c44772d 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) > > 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) > { > @@ -1005,7 +1004,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; > } > > @@ -1470,8 +1469,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; >
Jan Beulich
2013-May-02 09:31 UTC
Re: [PATCH net-next 1/2] xen-netback: remove redundent parameter in netbk_count_requests
>>> On 30.04.13 at 18:50, Wei Liu <wei.liu2@citrix.com> wrote: > Tracking down from the caller, first_idx is always equal to vif->tx.req_cons. > Remove it to avoid confusion. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>Suggested-by: Jan Beulich <jbeulich@suse.com>> --- > drivers/net/xen-netback/netback.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/xen-netback/netback.c > b/drivers/net/xen-netback/netback.c > index a2865f1..c44772d 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) > > 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) > { > @@ -1005,7 +1004,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; > } > > @@ -1470,8 +1469,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; > > -- > 1.7.10.4