lkml.org 
[lkml]   [2009]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 27/33] Staging: rt2870: remove SHOW_ADHOC_ENTRY_INFO support
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH] Staging: rt2870: remove SHOW_ADHOC_ENTRY_INFO support

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/staging/rt2860/sta_ioctl.c | 61 -------------------------------------
    1 file changed, 61 deletions(-)

    Index: b/drivers/staging/rt2860/sta_ioctl.c
    ===================================================================
    --- a/drivers/staging/rt2860/sta_ioctl.c
    +++ b/drivers/staging/rt2860/sta_ioctl.c
    @@ -87,10 +87,6 @@ struct iw_priv_args privtab[] = {
    0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "radio_on" },
    { SHOW_CFG_VALUE,
    IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "show" },
    -#if !defined(RT2860) && !defined(RT30xx)
    - { SHOW_ADHOC_ENTRY_INFO,
    - 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK, "adhocEntry" },
    -#endif
    /* --- sub-ioctls relations --- */

    { RTPRIV_IOCTL_STATISTICS,
    @@ -176,12 +172,6 @@ INT Set_ShortRetryLimit_Proc(
    IN PRTMP_ADAPTER pAdapter,
    IN PUCHAR arg);

    -#if !defined(RT2860) && !defined(RT30xx)
    -INT Show_Adhoc_MacTable_Proc(
    - IN PRTMP_ADAPTER pAd,
    - IN PCHAR extra);
    -#endif
    -
    static struct {
    CHAR *name;
    INT (*set_proc)(PRTMP_ADAPTER pAdapter, PUCHAR arg);
    @@ -1854,12 +1844,6 @@ rt_private_show(struct net_device *dev,
    wrq->length = strlen(extra) + 1; // 1: size of '\0'
    }
    break;
    -#if !defined(RT2860) && !defined(RT30xx)
    - case SHOW_ADHOC_ENTRY_INFO:
    - Show_Adhoc_MacTable_Proc(pAd, extra);
    - wrq->length = strlen(extra) + 1; // 1: size of '\0'
    - break;
    -#endif
    default:
    DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __func__, subcmd));
    break;
    @@ -3820,48 +3804,3 @@ INT Set_ShortRetryLimit_Proc(
    DBGPRINT(RT_DEBUG_TRACE, ("IF Set_ShortRetryLimit_Proc::(tx_rty_cfg=0x%x)\n", tx_rty_cfg.word));
    return TRUE;
    }
    -
    -#if !defined(RT2860) && !defined(RT30xx)
    -INT Show_Adhoc_MacTable_Proc(
    - IN PRTMP_ADAPTER pAd,
    - IN PCHAR extra)
    -{
    - INT i;
    -
    - sprintf(extra, "\n");
    -
    - sprintf(extra + strlen(extra), "HT Operating Mode : %d\n", pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode);
    -
    - sprintf(extra + strlen(extra), "\n%-19s%-4s%-4s%-7s%-7s%-7s%-10s%-6s%-6s%-6s%-6s\n",
    - "MAC", "AID", "BSS", "RSSI0", "RSSI1", "RSSI2", "PhMd", "BW", "MCS", "SGI", "STBC");
    -
    - for (i=1; i<MAX_LEN_OF_MAC_TABLE; i++)
    - {
    - PMAC_TABLE_ENTRY pEntry = &pAd->MacTab.Content[i];
    -
    - if (strlen(extra) > (IW_PRIV_SIZE_MASK - 30))
    - break;
    - if ((pEntry->ValidAsCLI || pEntry->ValidAsApCli) && (pEntry->Sst == SST_ASSOC))
    - {
    - sprintf(extra + strlen(extra), "%02X:%02X:%02X:%02X:%02X:%02X ",
    - pEntry->Addr[0], pEntry->Addr[1], pEntry->Addr[2],
    - pEntry->Addr[3], pEntry->Addr[4], pEntry->Addr[5]);
    - sprintf(extra + strlen(extra), "%-4d", (int)pEntry->Aid);
    - sprintf(extra + strlen(extra), "%-4d", (int)pEntry->apidx);
    - sprintf(extra + strlen(extra), "%-7d", pEntry->RssiSample.AvgRssi0);
    - sprintf(extra + strlen(extra), "%-7d", pEntry->RssiSample.AvgRssi1);
    - sprintf(extra + strlen(extra), "%-7d", pEntry->RssiSample.AvgRssi2);
    - sprintf(extra + strlen(extra), "%-10s", GetPhyMode(pEntry->HTPhyMode.field.MODE));
    - sprintf(extra + strlen(extra), "%-6s", GetBW(pEntry->HTPhyMode.field.BW));
    - sprintf(extra + strlen(extra), "%-6d", pEntry->HTPhyMode.field.MCS);
    - sprintf(extra + strlen(extra), "%-6d", pEntry->HTPhyMode.field.ShortGI);
    - sprintf(extra + strlen(extra), "%-6d", pEntry->HTPhyMode.field.STBC);
    - sprintf(extra + strlen(extra), "%-10d, %d, %d%%\n", pEntry->DebugFIFOCount, pEntry->DebugTxCount,
    - (pEntry->DebugTxCount) ? ((pEntry->DebugTxCount-pEntry->DebugFIFOCount)*100/pEntry->DebugTxCount) : 0);
    - sprintf(extra, "%s\n", extra);
    - }
    - }
    -
    - return TRUE;
    -}
    -#endif /* RT2870 */

    \
     
     \ /
      Last update: 2009-08-23 15:41    [W:5.738 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site