Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index ba29dc319b34..1f6c5486d715 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -320,16 +320,13 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
                 if (len < copybreak) {
                         struct sk_buff *nskb;
 
-                        nskb = netdev_alloc_skb(dev, len + NET_IP_ALIGN);
+                        nskb = netdev_alloc_skb_ip_align(dev, len);
                         if (!nskb) {
                                 /* forget packet, just rearm desc */
                                 priv->stats.rx_dropped++;
                                 continue;
                         }
 
-                        /* since we're copying the data, we can align
-                         * them properly */
-                        skb_reserve(nskb, NET_IP_ALIGN);
                         dma_sync_single_for_cpu(kdev, desc->address,
                                                 len, DMA_FROM_DEVICE);
                         memcpy(nskb->data, skb->data, len);