Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 4a362875502..25f7339daab 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1549,8 +1549,8 @@ static inline void rtl8139_thread_iter (struct net_device *dev,
         mii_lpa = mdio_read (dev, tp->phys[0], MII_LPA);
 
         if (!tp->mii.force_media && mii_lpa != 0xffff) {
-                int duplex = (mii_lpa & LPA_100FULL)
-                    || (mii_lpa & 0x01C0) == 0x0040;
+                int duplex = ((mii_lpa & LPA_100FULL) ||
+                              (mii_lpa & 0x01C0) == 0x0040);
                 if (tp->mii.full_duplex != duplex) {
                         tp->mii.full_duplex = duplex;
 
@@ -1936,8 +1936,8 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
                  RTL_R16 (RxBufAddr),
                  RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd));
 
-        while (netif_running(dev) && received < budget
-               && (RTL_R8 (ChipCmd) & RxBufEmpty) == 0) {
+        while (netif_running(dev) && received < budget &&
+               (RTL_R8 (ChipCmd) & RxBufEmpty) == 0) {
                 u32 ring_offset = cur_rx % RX_BUF_LEN;
                 u32 rx_status;
                 unsigned int pkt_size;
@@ -2004,9 +2004,8 @@ no_early_rx:
                 /* Malloc up new buffer, compatible with net-2e. */
                 /* Omit the four octet CRC from the length. */
 
-                skb = netdev_alloc_skb(dev, pkt_size + NET_IP_ALIGN);
+                skb = netdev_alloc_skb_ip_align(dev, pkt_size);
                 if (likely(skb)) {
-                        skb_reserve (skb, NET_IP_ALIGN);        /* 16 byte align the IP fields. */
 #if RX_BUF_IDX == 3
                         wrap_copy(skb, rx_ring, ring_offset+4, pkt_size);
 #else
@@ -2522,8 +2521,8 @@ static void __set_rx_mode (struct net_device *dev)
                     AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
                     AcceptAllPhys;
                 mc_filter[1] = mc_filter[0] = 0xffffffff;
-        } else if ((dev->mc_count > multicast_filter_limit)
-                   || (dev->flags & IFF_ALLMULTI)) {
+        } else if ((dev->mc_count > multicast_filter_limit) ||
+                   (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to filter perfectly -- accept all multicasts. */
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
                 mc_filter[1] = mc_filter[0] = 0xffffffff;