]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
staging: wilc1000: remove if defined codes of FORCE_P2P_CLIENT
authorChaehyun Lim <chaehyun.lim@gmail.com>
Tue, 15 Sep 2015 05:06:27 +0000 (14:06 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Sep 2015 13:52:49 +0000 (06:52 -0700)
This patch removes if defined codes of FORCE_P2P_CLIENT.
This macro is deleted because it it commented out.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

index c3e0892ef24091ca132a7c26eb48f4e698d910b6..3ecf5b1772d361183a13da72ca0154d89e003059 100644 (file)
@@ -2028,11 +2028,7 @@ void WILC_WFI_CfgParseRxAction(u8 *buf, u32 len)
 
        while (index < len) {
                if (buf[index] == GO_INTENT_ATTR_ID) {
-                       #ifdef FORCE_P2P_CLIENT
-                       buf[index + 3] = (buf[index + 3]  & 0x01) | (0x0f << 1);
-                       #else
                        buf[index + 3] = (buf[index + 3]  & 0x01) | (0x00 << 1);
-                       #endif
                }
 
                if (buf[index] ==  CHANLIST_ATTR_ID)
@@ -2085,11 +2081,7 @@ void WILC_WFI_CfgParseTxAction(u8 *buf, u32 len, bool bOperChan, u8 iftype)
 
        while (index < len) {
                if (buf[index] == GO_INTENT_ATTR_ID) {
-                       #ifdef FORCE_P2P_CLIENT
-                       buf[index + 3] = (buf[index + 3]  & 0x01) | (0x00 << 1);
-                       #else
                        buf[index + 3] = (buf[index + 3]  & 0x01) | (0x0f << 1);
-                       #endif
 
                        break;
                }