Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[karo-tx-linux.git] / drivers / staging / rtl8187se / r8180_core.c

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 4fe52f6b0034b67bdcac812b0a42f3f2b5a8fde1..fd22b75aea4f1b549bf990ed6ea94371d8efd013 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -1329,7 +1329,7 @@ u16 N_DBPSOfRate(u16 DataRate)
 }
 
 /*
- * For Netgear case, they want good-looking singal strength.
+ * For Netgear case, they want good-looking signal strength.
  */
 long NetgearSignalStrengthTranslate(long LastSS, long CurrSS)
 {
@@ -1380,7 +1380,7 @@ long TranslateToDbm8185(u8 SignalStrengthIndex)
 
 /*
  * Perform signal smoothing for dynamic mechanism.
- * This is different with PerformSignalSmoothing8185 in smoothing fomula.
+ * This is different with PerformSignalSmoothing8185 in smoothing formula.
  * No dramatic adjustion is apply because dynamic mechanism need some degree
  * of correctness. Ported from 8187B.
  */
@@ -1535,7 +1535,7 @@ void rtl8180_rx(struct net_device *dev)
                        /* HW is probably passing several buggy frames
                        * without FD or LD flag set.
                        * Throw this garbage away to prevent skb
-                       * memory exausting
+                       * memory exhausting
                        */
                        if (!priv->rx_skb_complete)
                                dev_kfree_skb_any(priv->rx_skb);
@@ -1648,14 +1648,14 @@ void rtl8180_rx(struct net_device *dev)
                        priv->Stats_SignalQuality = (long)(priv->Stats_SignalQuality * 5 + (long)priv->SignalQuality + 5) / 6;
                        priv->Stats_RecvSignalPower = (long)(priv->Stats_RecvSignalPower * 5 + priv->RecvSignalPower - 1) / 6;
 
-               /* Figure out which antenna that received the lasted packet. */
+               /* Figure out which antenna that received the last packet. */
                        priv->LastRxPktAntenna = Antenna ? 1 : 0; /* 0: aux, 1: main. */
                        SwAntennaDiversityRxOk8185(dev, priv->SignalStrength);
                }
 
                if (first) {
                        if (!priv->rx_skb_complete) {
-                               /* seems that HW sometimes fails to reiceve and
+                               /* seems that HW sometimes fails to receive and
                                   doesn't provide the last descriptor */
                                dev_kfree_skb_any(priv->rx_skb);
                                priv->stats.rxnolast++;
@@ -1672,7 +1672,7 @@ void rtl8180_rx(struct net_device *dev)
                        priv->rx_skb_complete = 0;
                        priv->rx_skb->dev = dev;
                } else {
-                       /* if we are here we should  have already RXed
+                       /* if we are here we should have already RXed
                        * the first frame.
                        * If we get here and the skb is not allocated then
                        * we have just throw out garbage (skb not allocated)
@@ -1821,15 +1821,15 @@ rate) {
 /*
  * This is a rough attempt to TX a frame
  * This is called by the ieee 80211 stack to TX management frames.
- * If the ring is full packet are dropped (for data frame the queue
+ * If the ring is full packets are dropped (for data frame the queue
  * is stopped before this can happen). For this reason it is better
  * if the descriptors are larger than the largest management frame
- * we intend to TX: i'm unsure what the HW does if it will not found
+ * we intend to TX: i'm unsure what the HW does if it will not find
  * the last fragment of a frame because it has been dropped...
  * Since queues for Management and Data frames are different we
  * might use a different lock than tx_lock (for example mgmt_tx_lock)
  */
-/* these function may loops if invoked with 0 descriptors or 0 len buffer */
+/* these function may loop if invoked with 0 descriptors or 0 len buffer */
 int rtl8180_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
@@ -2003,8 +2003,7 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
        }
 
                memcpy(&dest, frag_hdr->addr1, ETH_ALEN);
-               if (is_multicast_ether_addr(dest) ||
-                               is_broadcast_ether_addr(dest)) {
+               if (is_multicast_ether_addr(dest)) {
                        Duration = 0;
                        RtsDur = 0;
                        bRTSEnable = 0;
@@ -2378,7 +2377,7 @@ void rtl8180_wmm_param_update(struct work_struct *work)
                                u8              u1bAIFS;
                                u32             u4bAcParam;
                                pAcParam = (PAC_PARAM)(&AcParam);
-                               /* Retrive paramters to udpate. */
+                               /* Retrieve paramters to update. */
                                u1bAIFS = pAcParam->f.AciAifsn.f.AIFSN * (((mode&IEEE_G) == IEEE_G) ? 9 : 20) + aSifsTime;
                                u4bAcParam = ((((u32)(pAcParam->f.TXOPLimit))<<AC_PARAM_TXOP_LIMIT_OFFSET)|
                                              (((u32)(pAcParam->f.Ecw.f.ECWmax))<<AC_PARAM_ECW_MAX_OFFSET)|
@@ -2414,7 +2413,7 @@ void rtl8180_wmm_param_update(struct work_struct *work)
                        u8              u1bAIFS;
                        u32             u4bAcParam;
 
-                       /* Retrive paramters to udpate. */
+                       /* Retrieve paramters to update. */
                        eACI = pAcParam->f.AciAifsn.f.ACI;
                        /* Mode G/A: slotTimeTimer = 9; Mode B: 20 */
                        u1bAIFS = pAcParam->f.AciAifsn.f.AIFSN * (((mode&IEEE_G) == IEEE_G) ? 9 : 20) + aSifsTime;
@@ -2700,7 +2699,7 @@ short rtl8180_init(struct net_device *dev)
        priv->bTxPowerTrack = false;
        priv->ThermalMeter = 0;
        priv->FalseAlarmRegValue = 0;
-       priv->RegDigOfdmFaUpTh = 0xc; /* Upper threhold of OFDM false alarm, which is used in DIG. */
+       priv->RegDigOfdmFaUpTh = 0xc; /* Upper threshold of OFDM false alarm, which is used in DIG. */
        priv->DIG_NumberFallbackVote = 0;
        priv->DIG_NumberUpgradeVote = 0;
        priv->LastSignalStrengthInPercent = 0;
@@ -2896,7 +2895,7 @@ short rtl8180_init(struct net_device *dev)
                priv->chtxpwr_ofdm[i+1] = (word & 0xff00) >> 8;
        }
 
-       /* 3Read crystal calibtration and thermal meter indication on 87SE. */
+       /* 3Read crystal calibration and thermal meter indication on 87SE. */
        eeprom_93cx6_read(&eeprom, EEPROM_RSV>>1, &tmpu16);
 
        /* Crystal calibration for Xin and Xout resp. */
@@ -3140,7 +3139,7 @@ void rtl8180_adapter_start(struct net_device *dev)
 
        /*
         * The following is very strange. seems to be that 1 means test mode,
-        * but we need to acknolwledges the nic when a packet is ready
+        * but we need to acknowledges the nic when a packet is ready
         * although we set it to 0
         */
 
@@ -3971,7 +3970,7 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs)
        }
 
        if (inta == 0xffff) {
-               /* HW disappared */
+               /* HW disappeared */
                spin_unlock_irqrestore(&priv->irq_th_lock, flags);
                return IRQ_HANDLED;
        }