From 6aa4055ef0544ae85457c25c510fe3db04949c43 Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Fri, 7 Aug 2015 17:11:34 +0900 Subject: Base Code merged to SPIN 2.4 Signed-off-by: hyunuktak Change-Id: I84a42375b5c59739e4caca1f726699ea7647ef17 --- include/network.h | 6 ++++++ 1 file changed, 6 insertions(+) mode change 100644 => 100755 include/network.h (limited to 'include/network.h') diff --git a/include/network.h b/include/network.h old mode 100644 new mode 100755 index 5528f196..97b76e5b --- a/include/network.h +++ b/include/network.h @@ -136,6 +136,9 @@ int connman_network_set_proxy(struct connman_network *network, const char *proxies); void connman_network_clear_associating(struct connman_network *network); +int connman_network_set_is_hs20AP(struct connman_network *network, + unsigned int isHS20AP); +unsigned int connman_network_get_is_hs20AP(struct connman_network *network); #endif int connman_network_set_name(struct connman_network *network, @@ -178,6 +181,9 @@ struct connman_network_driver { void (*remove) (struct connman_network *network); int (*connect) (struct connman_network *network); int (*disconnect) (struct connman_network *network); +#if defined TIZEN_EXT + int (*merge) (struct connman_network *network); +#endif }; int connman_network_driver_register(struct connman_network_driver *driver); -- cgit v1.2.3