1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 7b92897ca66b..d5ab4dad5051 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -440,7 +440,7 @@ union ring_type {
 #define NV_RX3_VLAN_TAG_PRESENT (1<<16)
 #define NV_RX3_VLAN_TAG_MASK    (0x0000FFFF)
 
-/* Miscelaneous hardware related defines: */
+/* Miscellaneous hardware related defines: */
 #define NV_PCI_REGSZ_VER1       0x270
 #define NV_PCI_REGSZ_VER2       0x2d4
 #define NV_PCI_REGSZ_VER3       0x604
@@ -1488,7 +1488,7 @@ static int phy_init(struct net_device *dev)
                 }
         }
 
-        /* some phys clear out pause advertisment on reset, set it back */
+        /* some phys clear out pause advertisement on reset, set it back */
         mii_rw(dev, np->phyaddr, MII_ADVERTISE, reg);
 
         /* restart auto negotiation, power down phy */
@@ -2535,7 +2535,7 @@ static void nv_tx_timeout(struct net_device *dev)
         else
                 nv_tx_done_optimized(dev, np->tx_ring_size);
 
-        /* save current HW postion */
+        /* save current HW position */
         if (np->tx_change_owner)
                 put_tx.ex = np->tx_change_owner->first_tx_desc;
         else
@@ -4053,7 +4053,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 
         } else if (ecmd->autoneg == AUTONEG_DISABLE) {
                 /* Note: autonegotiation disable, speed 1000 intentionally
-                 * forbidden - noone should need that. */
+                 * forbidden - no one should need that. */
 
                 if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100)
                         return -EINVAL;
@@ -4103,7 +4103,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                         adv |= ADVERTISE_100HALF;
                 if (ecmd->advertising & ADVERTISED_100baseT_Full)
                         adv |= ADVERTISE_100FULL;
-                if (np->pause_flags & NV_PAUSEFRAME_RX_REQ)  /* for rx we set both advertisments but disable tx pause */
+                if (np->pause_flags & NV_PAUSEFRAME_RX_REQ)  /* for rx we set both advertisements but disable tx pause */
                         adv |=  ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
                 if (np->pause_flags & NV_PAUSEFRAME_TX_REQ)
                         adv |=  ADVERTISE_PAUSE_ASYM;
@@ -4148,7 +4148,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 if (ecmd->speed == SPEED_100 && ecmd->duplex == DUPLEX_FULL)
                         adv |= ADVERTISE_100FULL;
                 np->pause_flags &= ~(NV_PAUSEFRAME_AUTONEG|NV_PAUSEFRAME_RX_ENABLE|NV_PAUSEFRAME_TX_ENABLE);
-                if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) {/* for rx we set both advertisments but disable tx pause */
+                if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) {/* for rx we set both advertisements but disable tx pause */
                         adv |=  ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
                         np->pause_flags |= NV_PAUSEFRAME_RX_ENABLE;
                 }
@@ -4449,7 +4449,7 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*
 
                 adv = mii_rw(dev, np->phyaddr, MII_ADVERTISE, MII_READ);
                 adv &= ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
-                if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) /* for rx we set both advertisments but disable tx pause */
+                if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) /* for rx we set both advertisements but disable tx pause */
                         adv |=  ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
                 if (np->pause_flags & NV_PAUSEFRAME_TX_REQ)
                         adv |=  ADVERTISE_PAUSE_ASYM;