treewide: fix potentially dangerous trailing ';' in #defined values/expressions
[sfrench/cifs-2.6.git] / drivers / net / natsemi.c
index b78be088c4ad53b54be4c61b37cb0cb7d93c9373..c69f82a17c280bf039dade352e3ceed9c0a3b2c0 100644 (file)
@@ -1382,7 +1382,7 @@ static int find_mii(struct net_device *dev)
 /* WCSR bits [0:4] [9:10] */
 #define WCSR_RESET_SAVE 0x61f
 /* RFCR bits [20] [22] [27:31] */
-#define RFCR_RESET_SAVE 0xf8500000;
+#define RFCR_RESET_SAVE 0xf8500000
 
 static void natsemi_reset(struct net_device *dev)
 {
@@ -2360,7 +2360,8 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do)
                                        PCI_DMA_FROMDEVICE);
                        } else {
                                pci_unmap_single(np->pci_dev, np->rx_dma[entry],
-                                       buflen, PCI_DMA_FROMDEVICE);
+                                                buflen + NATSEMI_PADDING,
+                                                PCI_DMA_FROMDEVICE);
                                skb_put(skb = np->rx_skbuff[entry], pkt_len);
                                np->rx_skbuff[entry] = NULL;
                        }
@@ -2919,7 +2920,7 @@ static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
 
        /*
         * If we're ignoring the PHY then autoneg and the internal
-        * transciever are really not going to work so don't let the
+        * transceiver are really not going to work so don't let the
         * user select them.
         */
        if (np->ignore_phy && (ecmd->autoneg == AUTONEG_ENABLE ||