Merge tag 'metag-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...
[cascardo/linux.git] / drivers / staging / rtl8192u / ieee80211 / dot11d.c
index 34edcfa..90ace79 100644 (file)
@@ -1,16 +1,8 @@
-//-----------------------------------------------------------------------------
-//     File:
-//             Dot11d.c
-//
-//     Description:
-//             Implement 802.11d.
-//
-//-----------------------------------------------------------------------------
+/* Implement 802.11d. */
 
 #include "dot11d.h"
 
-void
-Dot11d_Init(struct ieee80211_device *ieee)
+void Dot11d_Init(struct ieee80211_device *ieee)
 {
        PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
 
@@ -22,55 +14,42 @@ Dot11d_Init(struct ieee80211_device *ieee)
        memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
        RESET_CIE_WATCHDOG(ieee);
 
-       printk("Dot11d_Init()\n");
+       netdev_info(ieee->dev, "Dot11d_Init()\n");
 }
+EXPORT_SYMBOL(Dot11d_Init);
 
-//
-//     Description:
-//             Reset to the state as we are just entering a regulatory domain.
-//
-void
-Dot11d_Reset(struct ieee80211_device *ieee)
+/* Reset to the state as we are just entering a regulatory domain. */
+void Dot11d_Reset(struct ieee80211_device *ieee)
 {
        u32 i;
        PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
-       // Clear old channel map
+       /* Clear old channel map */
        memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
        memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
-       // Set new channel map
-       for (i=1; i<=11; i++) {
+       /* Set new channel map */
+       for (i = 1; i <= 11; i++)
                (pDot11dInfo->channel_map)[i] = 1;
-       }
-       for (i=12; i<=14; i++) {
+
+       for (i = 12; i <= 14; i++)
                (pDot11dInfo->channel_map)[i] = 2;
-       }
 
        pDot11dInfo->State = DOT11D_STATE_NONE;
        pDot11dInfo->CountryIeLen = 0;
        RESET_CIE_WATCHDOG(ieee);
-
-       //printk("Dot11d_Reset()\n");
 }
+EXPORT_SYMBOL(Dot11d_Reset);
 
-//
-//     Description:
-//             Update country IE from Beacon or Probe Resopnse
-//             and configure PHY for operation in the regulatory domain.
-//
-//     TODO:
-//             Configure Tx power.
-//
-//     Assumption:
-//             1. IS_DOT11D_ENABLE() is TRUE.
-//             2. Input IE is an valid one.
-//
-void
-Dot11d_UpdateCountryIe(
-       struct ieee80211_device *dev,
-       u8 *pTaddr,
-       u16     CoutryIeLen,
-       u8 *pCoutryIe
-       )
+/*
+ * Update country IE from Beacon or Probe Resopnse and configure PHY for
+ * operation in the regulatory domain.
+ *
+ * TODO: Configure Tx power.
+ * Assumption:
+ * 1. IS_DOT11D_ENABLE() is TRUE.
+ * 2. Input IE is an valid one.
+ */
+void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr,
+                           u16 CoutryIeLen, u8 *pCoutryIe)
 {
        PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
        u8 i, j, NumTriples, MaxChnlNum;
@@ -79,23 +58,25 @@ Dot11d_UpdateCountryIe(
        memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
        memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
        MaxChnlNum = 0;
-       NumTriples = (CoutryIeLen - 3) / 3; // skip 3-byte country string.
+       NumTriples = (CoutryIeLen - 3) / 3; /* skip 3-byte country string. */
        pTriple = (PCHNL_TXPOWER_TRIPLE)(pCoutryIe + 3);
-       for(i = 0; i < NumTriples; i++)
-       {
-               if(MaxChnlNum >= pTriple->FirstChnl)
-               { // It is not in a monotonically increasing order, so stop processing.
-                       printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........1\n");
+       for (i = 0; i < NumTriples; i++) {
+               if (MaxChnlNum >= pTriple->FirstChnl) {
+                       /* It is not in a monotonically increasing order, so
+                        * stop processing.
+                        */
+                       netdev_err(dev->dev, "Dot11d_UpdateCountryIe(): Invalid country IE, skip it........1\n");
                        return;
                }
-               if(MAX_CHANNEL_NUMBER < (pTriple->FirstChnl + pTriple->NumChnls))
-               { // It is not a valid set of channel id, so stop processing.
-                       printk("Dot11d_UpdateCountryIe(): Invalid country IE, skip it........2\n");
+               if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl + pTriple->NumChnls)) {
+                       /* It is not a valid set of channel id, so stop
+                        * processing.
+                        */
+                       netdev_err(dev->dev, "Dot11d_UpdateCountryIe(): Invalid country IE, skip it........2\n");
                        return;
                }
 
-               for(j = 0 ; j < pTriple->NumChnls; j++)
-               {
+               for (j = 0; j < pTriple->NumChnls; j++) {
                        pDot11dInfo->channel_map[pTriple->FirstChnl + j] = 1;
                        pDot11dInfo->MaxTxPwrDbmList[pTriple->FirstChnl + j] = pTriple->MaxTxPowerInDbm;
                        MaxChnlNum = pTriple->FirstChnl + j;
@@ -103,60 +84,48 @@ Dot11d_UpdateCountryIe(
 
                pTriple = (PCHNL_TXPOWER_TRIPLE)((u8 *)pTriple + 3);
        }
-       //printk("Dot11d_UpdateCountryIe(): Channel List:\n");
-       printk("Channel List:");
-       for(i=1; i<= MAX_CHANNEL_NUMBER; i++)
-               if(pDot11dInfo->channel_map[i] > 0)
-                       printk(" %d", i);
-       printk("\n");
+       netdev_info(dev->dev, "Channel List:");
+       for (i = 1; i <= MAX_CHANNEL_NUMBER; i++)
+               if (pDot11dInfo->channel_map[i] > 0)
+                       netdev_info(dev->dev, " %d", i);
+       netdev_info(dev->dev, "\n");
 
        UPDATE_CIE_SRC(dev, pTaddr);
 
        pDot11dInfo->CountryIeLen = CoutryIeLen;
-       memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe,CoutryIeLen);
+       memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe, CoutryIeLen);
        pDot11dInfo->State = DOT11D_STATE_LEARNED;
 }
+EXPORT_SYMBOL(Dot11d_UpdateCountryIe);
 
-
-u8
-DOT11D_GetMaxTxPwrInDbm(
-       struct ieee80211_device *dev,
-       u8 Channel
-       )
+u8 DOT11D_GetMaxTxPwrInDbm(struct ieee80211_device *dev, u8 Channel)
 {
        PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
        u8 MaxTxPwrInDbm = 255;
 
-       if(MAX_CHANNEL_NUMBER < Channel)
-       {
-               printk("DOT11D_GetMaxTxPwrInDbm(): Invalid Channel\n");
+       if (MAX_CHANNEL_NUMBER < Channel) {
+               netdev_err(dev->dev, "DOT11D_GetMaxTxPwrInDbm(): Invalid Channel\n");
                return MaxTxPwrInDbm;
        }
-       if(pDot11dInfo->channel_map[Channel])
-       {
+       if (pDot11dInfo->channel_map[Channel])
                MaxTxPwrInDbm = pDot11dInfo->MaxTxPwrDbmList[Channel];
-       }
 
        return MaxTxPwrInDbm;
 }
+EXPORT_SYMBOL(DOT11D_GetMaxTxPwrInDbm);
 
-
-void
-DOT11D_ScanComplete(
-       struct ieee80211_device *dev
-       )
+void DOT11D_ScanComplete(struct ieee80211_device *dev)
 {
        PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
 
-       switch (pDot11dInfo->State)
-       {
+       switch (pDot11dInfo->State) {
        case DOT11D_STATE_LEARNED:
                pDot11dInfo->State = DOT11D_STATE_DONE;
                break;
 
        case DOT11D_STATE_DONE:
-               if( GET_CIE_WATCHDOG(dev) == 0 )
-               { // Reset country IE if previous one is gone.
+               if (GET_CIE_WATCHDOG(dev) == 0) {
+                       /* Reset country IE if previous one is gone. */
                        Dot11d_Reset(dev);
                }
                break;
@@ -164,57 +133,43 @@ DOT11D_ScanComplete(
                break;
        }
 }
+EXPORT_SYMBOL(DOT11D_ScanComplete);
 
-int IsLegalChannel(
-       struct ieee80211_device *dev,
-       u8 channel
-)
+int IsLegalChannel(struct ieee80211_device *dev, u8 channel)
 {
        PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
 
-       if(MAX_CHANNEL_NUMBER < channel)
-       {
-               printk("IsLegalChannel(): Invalid Channel\n");
+       if (MAX_CHANNEL_NUMBER < channel) {
+               netdev_err(dev->dev, "IsLegalChannel(): Invalid Channel\n");
                return 0;
        }
-       if(pDot11dInfo->channel_map[channel] > 0)
+       if (pDot11dInfo->channel_map[channel] > 0)
                return 1;
        return 0;
 }
+EXPORT_SYMBOL(IsLegalChannel);
 
-int ToLegalChannel(
-       struct ieee80211_device *dev,
-       u8 channel
-)
+int ToLegalChannel(struct ieee80211_device *dev, u8 channel)
 {
        PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
        u8 default_chn = 0;
        u32 i = 0;
 
-       for (i=1; i<= MAX_CHANNEL_NUMBER; i++)
-       {
-               if(pDot11dInfo->channel_map[i] > 0)
-               {
+       for (i = 1; i <= MAX_CHANNEL_NUMBER; i++) {
+               if (pDot11dInfo->channel_map[i] > 0) {
                        default_chn = i;
                        break;
                }
        }
 
-       if(MAX_CHANNEL_NUMBER < channel)
-       {
-               printk("IsLegalChannel(): Invalid Channel\n");
+       if (MAX_CHANNEL_NUMBER < channel) {
+               netdev_err(dev->dev, "IsLegalChannel(): Invalid Channel\n");
                return default_chn;
        }
 
-       if(pDot11dInfo->channel_map[channel] > 0)
+       if (pDot11dInfo->channel_map[channel] > 0)
                return channel;
 
        return default_chn;
 }
-EXPORT_SYMBOL(Dot11d_Init);
-EXPORT_SYMBOL(Dot11d_Reset);
-EXPORT_SYMBOL(Dot11d_UpdateCountryIe);
-EXPORT_SYMBOL(DOT11D_GetMaxTxPwrInDbm);
-EXPORT_SYMBOL(DOT11D_ScanComplete);
-EXPORT_SYMBOL(IsLegalChannel);
 EXPORT_SYMBOL(ToLegalChannel);