Merge branch 'xen-netback-next'

David Vrabel says:

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

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

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index f379689dde30..7342a6bb5557 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -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);
         }
 }
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 08f65996534c..85fec0fb4ec2 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -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;