1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 975e25b19ebe..78b7167a8ce3 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1942,8 +1942,8 @@ vortex_error(struct net_device *dev, int status)
         if (status & TxComplete) {                      /* Really "TxError" for us. */
                 tx_status = ioread8(ioaddr + TxStatus);
                 /* Presumably a tx-timeout. We must merely re-enable. */
-                if (vortex_debug > 2
-                        || (tx_status != 0x88 && vortex_debug > 0)) {
+                if (vortex_debug > 2 ||
+                    (tx_status != 0x88 && vortex_debug > 0)) {
                         pr_err("%s: Transmit error, Tx status register %2.2x.\n",
                                    dev->name, tx_status);
                         if (tx_status == 0x82) {
@@ -2560,7 +2560,7 @@ boomerang_rx(struct net_device *dev)
                 struct sk_buff *skb;
                 entry = vp->dirty_rx % RX_RING_SIZE;
                 if (vp->rx_skbuff[entry] == NULL) {
-                        skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN);
+                        skb = netdev_alloc_skb_ip_align(dev, PKT_BUF_SZ);
                         if (skb == NULL) {
                                 static unsigned long last_jif;
                                 if (time_after(jiffies, last_jif + 10 * HZ)) {
@@ -2572,7 +2572,6 @@ boomerang_rx(struct net_device *dev)
                                 break;                  /* Bad news!  */
                         }
 
-                        skb_reserve(skb, NET_IP_ALIGN);
                         vp->rx_ring[entry].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data, PKT_BUF_SZ, PCI_DMA_FROMDEVICE));
                         vp->rx_skbuff[entry] = skb;
                 }