diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/atmel.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/strip.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 350157fcd080..4223672c4432 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -3836,7 +3836,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
3836 | This routine is also responsible for initialising some | 3836 | This routine is also responsible for initialising some |
3837 | hardware-specific fields in the atmel_private structure, | 3837 | hardware-specific fields in the atmel_private structure, |
3838 | including a copy of the firmware's hostinfo stucture | 3838 | including a copy of the firmware's hostinfo stucture |
3839 | which is the route into the rest of the firmare datastructures. */ | 3839 | which is the route into the rest of the firmware datastructures. */ |
3840 | 3840 | ||
3841 | struct atmel_private *priv = netdev_priv(dev); | 3841 | struct atmel_private *priv = netdev_priv(dev); |
3842 | u8 configuration; | 3842 | u8 configuration; |
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 1667065b86a7..823c2bf5e31e 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -1332,7 +1332,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv) | |||
1332 | IPW_AUX_HOST_RESET_REG_STOP_MASTER); | 1332 | IPW_AUX_HOST_RESET_REG_STOP_MASTER); |
1333 | 1333 | ||
1334 | /* Step 2. Wait for stop Master Assert | 1334 | /* Step 2. Wait for stop Master Assert |
1335 | * (not more then 50us, otherwise ret error */ | 1335 | * (not more than 50us, otherwise ret error */ |
1336 | i = 5; | 1336 | i = 5; |
1337 | do { | 1337 | do { |
1338 | udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY); | 1338 | udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY); |
@@ -1830,7 +1830,7 @@ static void ipw2100_down(struct ipw2100_priv *priv) | |||
1830 | cancel_delayed_work(&priv->rf_kill); | 1830 | cancel_delayed_work(&priv->rf_kill); |
1831 | } | 1831 | } |
1832 | 1832 | ||
1833 | /* Kill the firmare hang check timer */ | 1833 | /* Kill the firmware hang check timer */ |
1834 | if (!priv->stop_hang_check) { | 1834 | if (!priv->stop_hang_check) { |
1835 | priv->stop_hang_check = 1; | 1835 | priv->stop_hang_check = 1; |
1836 | cancel_delayed_work(&priv->hang_check); | 1836 | cancel_delayed_work(&priv->hang_check); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c index 37ad0d2fb64c..aee9cba13eb3 100644 --- a/drivers/net/wireless/rt2x00/rt2x00crypto.c +++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c | |||
@@ -184,8 +184,8 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align, | |||
184 | * Make room for new data, note that we increase both | 184 | * Make room for new data, note that we increase both |
185 | * headsize and tailsize when required. The tailsize is | 185 | * headsize and tailsize when required. The tailsize is |
186 | * only needed when ICV data needs to be inserted and | 186 | * only needed when ICV data needs to be inserted and |
187 | * the padding is smaller then the ICV data. | 187 | * the padding is smaller than the ICV data. |
188 | * When alignment requirements is greater then the | 188 | * When alignment requirements is greater than the |
189 | * ICV data we must trim the skb to the correct size | 189 | * ICV data we must trim the skb to the correct size |
190 | * because we need to remove the extra bytes. | 190 | * because we need to remove the extra bytes. |
191 | */ | 191 | */ |
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index dd0de3a9ed4e..7015f2480550 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
@@ -236,7 +236,7 @@ struct strip { | |||
236 | unsigned long tx_errors; /* Planned stuff */ | 236 | unsigned long tx_errors; /* Planned stuff */ |
237 | unsigned long rx_dropped; /* No memory for skb */ | 237 | unsigned long rx_dropped; /* No memory for skb */ |
238 | unsigned long tx_dropped; /* When MTU change */ | 238 | unsigned long tx_dropped; /* When MTU change */ |
239 | unsigned long rx_over_errors; /* Frame bigger then STRIP buf. */ | 239 | unsigned long rx_over_errors; /* Frame bigger than STRIP buf. */ |
240 | 240 | ||
241 | unsigned long pps_timer; /* Timer to determine pps */ | 241 | unsigned long pps_timer; /* Timer to determine pps */ |
242 | unsigned long rx_pps_count; /* Counter to determine pps */ | 242 | unsigned long rx_pps_count; /* Counter to determine pps */ |