Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 395e1cae authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

staging: ath6kl: s|A_MEMCMP|memcmp|g 



for i in $(find ./drivers/staging/ath6kl/ -name \*.[ch]) ; do \
        sed -r -i -e "s/A_MEMCMP/memcmp/g" $i; done

Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 05209262

drivers/staging/ath6kl/miscdrv/common_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static ATH_DEBUG_MODULE_DBG_INFO *FindModule(char *module_name) 


    while (pInfo != NULL) {

            /* TODO: need to use something other than strlen */

        if (A_MEMCMP(pInfo->ModuleName,module_name,strlen(module_name)) == 0) {

        if (memcmp(pInfo->ModuleName,module_name,strlen(module_name)) == 0) {

            break;

        }

        pInfo = pInfo->pNext;
@@ -916,7 +916,7 @@ void a_dump_module_debug_info_by_name(char *module_name) 
        return;

    }



    if (A_MEMCMP(module_name,"all",3) == 0) {

    if (memcmp(module_name,"all",3) == 0) {

            /* dump all */

        while (pInfo != NULL) {

            a_dump_module_debug_info(pInfo);

drivers/staging/ath6kl/os/linux/ar6000_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -4291,7 +4291,7 @@ ar6000_connect_event(AR_SOFTC_T *ar, u16 channel, u8 *bssid, 


    if(ar->arNetworkType & AP_NETWORK) {

        struct net_device *dev = ar->arNetDev;

        if(A_MEMCMP(dev->dev_addr, bssid, ATH_MAC_LEN)==0) {

        if(memcmp(dev->dev_addr, bssid, ATH_MAC_LEN)==0) {

            ar->arACS = channel;

            ik = &ar->ap_mode_bkey;
@@ -4605,7 +4605,7 @@ u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason) 
        }

    } else {

        for(i=0; i < AP_MAX_NUM_STA; i++) {

            if(A_MEMCMP(ar->sta_list[i].mac, mac, ATH_MAC_LEN)==0) {

            if(memcmp(ar->sta_list[i].mac, mac, ATH_MAC_LEN)==0) {

                A_PRINTF("DEL STA %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "

                " aid=%d REASON=%d\n", mac[0], mac[1], mac[2],

                 mac[3], mac[4], mac[5], ar->sta_list[i].aid, reason);
@@ -6281,7 +6281,7 @@ ap_set_wapi_key(struct ar6_softc *ar, void *ikey) 
    KEY_USAGE   keyUsage = 0;

    int    status;



    if (A_MEMCMP(ik->ik_macaddr, bcast_mac, IEEE80211_ADDR_LEN) == 0) {

    if (memcmp(ik->ik_macaddr, bcast_mac, IEEE80211_ADDR_LEN) == 0) {

        keyUsage = GROUP_USAGE;

    } else {

        keyUsage = PAIRWISE_USAGE;

drivers/staging/ath6kl/os/linux/cfg80211.c

+4 −4
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 


    if(ar->arConnected == true &&

       ar->arSsidLen == sme->ssid_len &&

       !A_MEMCMP(ar->arSsid, sme->ssid, ar->arSsidLen)) {

       !memcmp(ar->arSsid, sme->ssid, ar->arSsidLen)) {

        reconnect_flag = true;

        status = wmi_reconnect_cmd(ar->arWmi,

                                   ar->arReqBssid,
@@ -318,7 +318,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
        }

        return 0;

    } else if(ar->arSsidLen == sme->ssid_len &&

              !A_MEMCMP(ar->arSsid, sme->ssid, ar->arSsidLen)) {

              !memcmp(ar->arSsid, sme->ssid, ar->arSsidLen)) {

	    ar6000_disconnect(ar);

    }
@@ -332,7 +332,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 


    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));

    if(sme->bssid){

        if(A_MEMCMP(&sme->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {

        if(memcmp(&sme->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {

            memcpy(ar->arReqBssid, sme->bssid, sizeof(ar->arReqBssid));

        }

    }
@@ -1321,7 +1321,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, 


    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));

    if(ibss_param->bssid) {

        if(A_MEMCMP(&ibss_param->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {

        if(memcmp(&ibss_param->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {

            memcpy(ar->arReqBssid, ibss_param->bssid, sizeof(ar->arReqBssid));

        }

    }

drivers/staging/ath6kl/os/linux/include/osapi_linux.h

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
#define A_CPU2BE32(x)      htonl(x)



#define A_MEMZERO(addr, len)            memset(addr, 0, len)

#define A_MEMCMP(addr1, addr2, len)     memcmp((addr1), (addr2), (len))

#define A_MALLOC(size)                  kmalloc((size), GFP_KERNEL)

#define A_MALLOC_NOWAIT(size)           kmalloc((size), GFP_ATOMIC)

#define A_FREE(addr)                    kfree(addr)
@@ -364,7 +363,6 @@ static inline void *A_ALIGN_TO_CACHE_LINE(void *ptr) { 
#define POSTPACK                __ATTRIB_PACK



#define A_MEMZERO(addr, len)            memset((addr), 0, (len))

#define A_MEMCMP(addr1, addr2, len)     memcmp((addr1), (addr2), (len))

#define A_MALLOC(size)                  malloc(size)

#define A_FREE(addr)                    free(addr)

drivers/staging/ath6kl/os/linux/ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq) 
        return -EIO;

    }



    if (A_MEMCMP(cmd.bssid, null_mac, AR6000_ETH_ADDR_LEN) == 0) {

    if (memcmp(cmd.bssid, null_mac, AR6000_ETH_ADDR_LEN) == 0) {

        /*

         * This is a delete badAP.

         */
@@ -3127,7 +3127,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
                                      sizeof(adhocBssid)))

            {

                ret = -EFAULT;

            } else if (A_MEMCMP(adhocBssid.bssid, bcast_mac,

            } else if (memcmp(adhocBssid.bssid, bcast_mac,

                                AR6000_ETH_ADDR_LEN) == 0)

            {

                ret = -EFAULT;
@@ -4714,7 +4714,7 @@ u8 mac_cmp_wild(u8 *mac, u8 *new_mac, u8 wild, u8 new_wild) 
        if((wild & 1<<i) && (new_wild & 1<<i)) continue;

        if(mac[i] != new_mac[i]) return 1;

    }

    if((A_MEMCMP(new_mac, null_mac, 6)==0) && new_wild &&

    if((memcmp(new_mac, null_mac, 6)==0) && new_wild &&

        (wild != new_wild)) {

        return 1;

    }