summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Liu <wei.liu2@citrix.com>2013-03-25 01:08:20 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-07 12:49:35 -0700
commitbaff3c88fd65974bc8d11bd7bab0d60bbe0325a6 (patch)
tree8a02b591e4a1f800c06f014a5df3070d34915982
parent2e6c53ddade9836cb96821539c664cd6dff0be42 (diff)
downloadlinux-stable-baff3c88fd65974bc8d11bd7bab0d60bbe0325a6.tar.gz
linux-stable-baff3c88fd65974bc8d11bd7bab0d60bbe0325a6.tar.bz2
linux-stable-baff3c88fd65974bc8d11bd7bab0d60bbe0325a6.zip
xen-netback: remove skb in xen_netbk_alloc_page
commit 27f852282ab9a028f57da96d05c26f38c424a315 upstream. This variable is never used. 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/xen-netback/netback.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 2bdf798b3d9c..0d22cff02ded 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -914,7 +914,6 @@ static int netbk_count_requests(struct xenvif *vif,
}
static struct page *xen_netbk_alloc_page(struct xen_netbk *netbk,
- struct sk_buff *skb,
u16 pending_idx)
{
struct page *page;
@@ -948,7 +947,7 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
index = pending_index(netbk->pending_cons++);
pending_idx = netbk->pending_ring[index];
- page = xen_netbk_alloc_page(netbk, skb, pending_idx);
+ page = xen_netbk_alloc_page(netbk, pending_idx);
if (!page)
goto err;
@@ -1353,7 +1352,7 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
}
/* XXX could copy straight to head */
- page = xen_netbk_alloc_page(netbk, skb, pending_idx);
+ page = xen_netbk_alloc_page(netbk, pending_idx);
if (!page) {
kfree_skb(skb);
netbk_tx_err(vif, &txreq, idx);