iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xen-netback-next'

Browse Source 
David Vrabel says:

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

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

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-10-29 15:59:43 -04:00
commit c6be2a10ac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/xen-netback/interface.c
View File

@ -281,10 +281,10 @@ static void xenvif_down(struct xenvif *vif)
for (queue_index = 0; queue_index < num_queues; ++queue_index) { for (queue_index = 0; queue_index < num_queues; ++queue_index) {
queue = &vif->queues[queue_index]; queue = &vif->queues[queue_index];
napi_disable(&queue->napi);
disable_irq(queue->tx_irq); disable_irq(queue->tx_irq);
if (queue->tx_irq != queue->rx_irq) if (queue->tx_irq != queue->rx_irq)
disable_irq(queue->rx_irq); disable_irq(queue->rx_irq);
napi_disable(&queue->napi);
del_timer_sync(&queue->credit_timeout); del_timer_sync(&queue->credit_timeout);
} }
} }

2
drivers/net/xen-netback/netback.c
View File

@ -1494,7 +1494,7 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s
unsigned int len; unsigned int len;
BUG_ON(i >= MAX_SKB_FRAGS); BUG_ON(i >= MAX_SKB_FRAGS);
page = alloc_page(GFP_ATOMIC|__GFP_COLD); page = alloc_page(GFP_ATOMIC);
if (!page) { if (!page) {
int j; int j;
skb->truesize += skb->data_len; skb->truesize += skb->data_len;