From 68dbf4503afaa0af13d9f1181201cc7d3d023318 Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Fri, 11 Sep 2015 18:25:05 +0900 Subject: [PATCH] [wifi-direct-manager]Add undefined symbol for default case Change-Id: Ic8c64fc77e0279c20b013da3b3520622dac10555 Signed-off-by: Yu jiung --- include/wifi-direct-manager.h | 5 ++++- include/wifi-direct-util.h | 2 +- packaging/wifi-direct-manager.spec | 2 +- .../ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h | 12 ++++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h index 12b28cf..821371f 100755 --- a/include/wifi-direct-manager.h +++ b/include/wifi-direct-manager.h @@ -40,8 +40,11 @@ #define GROUP_IFNAME "wlan0" #endif -#if 0 +#ifndef DEFAULT_IFNAME #define DEFAULT_IFNAME "p2p0" +#endif + +#ifndef GROUP_IFNAME #define GROUP_IFNAME "p2p0" #endif diff --git a/include/wifi-direct-util.h b/include/wifi-direct-util.h index 5e4fc0d..3716f94 100755 --- a/include/wifi-direct-util.h +++ b/include/wifi-direct-util.h @@ -36,7 +36,7 @@ #define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address" #endif -#if 0 +#ifndef DEFAULT_MAC_FILE_PATH #define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address" #endif diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec index 07c02fd..75c3b76 100755 --- a/packaging/wifi-direct-manager.spec +++ b/packaging/wifi-direct-manager.spec @@ -1,6 +1,6 @@ Name: wifi-direct-manager Summary: Wi-Fi Direct manger -Version: 1.2.100 +Version: 1.2.101 Release: 1 Group: Network & Connectivity/Wireless License: Apache-2.0 diff --git a/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h index 006951c..f3f410b 100755 --- a/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h +++ b/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h @@ -88,7 +88,7 @@ #define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address" #endif -#if 0 +#ifndef DEFAULT_MAC_FILE_PATH #define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address" #endif @@ -104,11 +104,15 @@ #define GROUP_IFACE_PREFIX "wlan" #endif -#if 0 +#ifndef COMMON_IFACE_NAME #define COMMON_IFACE_NAME "p2p0" -#define DEFAULT_CONFIG_METHOD "push_button" -#define DEFAULT_NO_GROUP_IFACE 0 +#endif + +#ifndef GROUP_IFACE_NAME #define GROUP_IFACE_NAME "p2p0" +#endif + +#ifndef GROUP_IFACE_PREFIX #define GROUP_IFACE_PREFIX "p2p" #endif -- 2.7.4