netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: <netdev@vger.kernel.org>, <xen-devel@lists.xen.org>
Cc: <ian.campbell@citrix.com>, <david.vrabel@citrix.com>,
	<konrad.wilk@oracle.com>, <annie.li@oracle.com>,
	<wdauchy@gmail.com>, Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH 1/7] xen-netfront: remove unused variable `extra'
Date: Tue, 9 Apr 2013 12:07:29 +0100	[thread overview]
Message-ID: <1365505655-8021-2-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1365505655-8021-1-git-send-email-wei.liu2@citrix.com>

This variable is supposed to hold reference to the last extra_info in the
loop. However there is only type of extra info here and the loop to process
extra info is missing, so this variable is never used and causes confusion.

Remove it at the moment. We can add it back when necessary.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
---
 drivers/net/xen-netfront.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 7ffa43b..5527663 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -537,7 +537,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	struct netfront_info *np = netdev_priv(dev);
 	struct netfront_stats *stats = this_cpu_ptr(np->stats);
 	struct xen_netif_tx_request *tx;
-	struct xen_netif_extra_info *extra;
 	char *data = skb->data;
 	RING_IDX i;
 	grant_ref_t ref;
@@ -581,7 +580,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	tx->gref = np->grant_tx_ref[id] = ref;
 	tx->offset = offset;
 	tx->size = len;
-	extra = NULL;
 
 	tx->flags = 0;
 	if (skb->ip_summed == CHECKSUM_PARTIAL)
@@ -597,10 +595,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		gso = (struct xen_netif_extra_info *)
 			RING_GET_REQUEST(&np->tx, ++i);
 
-		if (extra)
-			extra->flags |= XEN_NETIF_EXTRA_FLAG_MORE;
-		else
-			tx->flags |= XEN_NETTXF_extra_info;
+		tx->flags |= XEN_NETTXF_extra_info;
 
 		gso->u.gso.size = skb_shinfo(skb)->gso_size;
 		gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
@@ -609,7 +604,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 		gso->type = XEN_NETIF_EXTRA_TYPE_GSO;
 		gso->flags = 0;
-		extra = gso;
 	}
 
 	np->tx.req_prod_pvt = i + 1;
-- 
1.7.10.4

  reply	other threads:[~2013-04-09 11:22 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-09 11:07 [PATCH V3 0/7] Bundle fixes for Xen netfront / netback Wei Liu
2013-04-09 11:07 ` Wei Liu [this message]
2013-04-09 11:07 ` [PATCH 2/7] xen-netfront: frags -> slots in xennet_get_responses Wei Liu
2013-04-09 11:07 ` [PATCH 3/7] xen-netback: remove skb in xen_netbk_alloc_page Wei Liu
2013-04-09 11:07 ` [PATCH 4/7] xen-netfront: frags -> slots in log message Wei Liu
2013-04-09 13:35   ` Sergei Shtylyov
2013-04-09 13:47     ` Wei Liu
2013-04-12 14:40       ` Sergei Shtylyov
2013-04-12 14:58         ` Wei Liu
2013-04-09 11:07 ` [PATCH 5/7] xen-netfront: reduce gso_max_size to account for ethernet header Wei Liu
2013-04-11 20:04   ` Wei Liu
2013-04-12  8:18     ` Ian Campbell
2013-04-12  8:48       ` Wei Liu
2013-04-12  8:57         ` Ian Campbell
2013-04-12  9:34           ` Wei Liu
2013-04-12  9:43             ` Ian Campbell
2013-04-12 12:58               ` Eric Dumazet
2013-04-12 13:29                 ` Wei Liu
2013-04-12 13:36                   ` Ian Campbell
2013-04-12 16:17       ` Ben Hutchings
2013-04-09 11:07 ` [PATCH 6/7] xen-netback: coalesce slots and fix regressions Wei Liu
2013-04-09 12:13   ` [Xen-devel] " Jan Beulich
2013-04-09 12:48     ` Wei Liu
2013-04-09 13:13       ` Jan Beulich
2013-04-09 13:48         ` Wei Liu
2013-04-09 11:07 ` [PATCH 7/7] xen-netback: don't disconnect frontend when seeing oversize packet Wei Liu
2013-04-09 11:34   ` David Laight
2013-04-09 11:54     ` Wei Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365505655-8021-2-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=annie.li@oracle.com \
    --cc=david.vrabel@citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=konrad.wilk@oracle.com \
    --cc=netdev@vger.kernel.org \
    --cc=wdauchy@gmail.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).