Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6be2a10 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'xen-netback-next' 



David Vrabel says:

====================
xen-netback: minor cleanups

Two minor xen-netback cleanups originally from Zoltan.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7fd2561e 44cc8ed1

drivers/net/xen-netback/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -281,10 +281,10 @@ static void xenvif_down(struct xenvif *vif) 


	for (queue_index = 0; queue_index < num_queues; ++queue_index) {

		queue = &vif->queues[queue_index];

		napi_disable(&queue->napi);

		disable_irq(queue->tx_irq);

		if (queue->tx_irq != queue->rx_irq)

			disable_irq(queue->rx_irq);

		napi_disable(&queue->napi);

		del_timer_sync(&queue->credit_timeout);

	}

}

drivers/net/xen-netback/netback.c

+1 −1
Original line number Diff line number Diff line
@@ -1494,7 +1494,7 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s 
		unsigned int len;



		BUG_ON(i >= MAX_SKB_FRAGS);

		page = alloc_page(GFP_ATOMIC|__GFP_COLD);

		page = alloc_page(GFP_ATOMIC);

		if (!page) {

			int j;

			skb->truesize += skb->data_len;