diff options
| author | hyunuktak <hyunuk.tak@samsung.com> | 2015-08-07 17:11:34 +0900 |
|---|---|---|
| committer | hyunuktak <hyunuk.tak@samsung.com> | 2015-08-07 17:11:56 +0900 |
| commit | 6aa4055ef0544ae85457c25c510fe3db04949c43 (patch) | |
| tree | 94018be3cef92c33b60650c488dc15536c8f978a /include/network.h | |
| parent | bc55a3df0d4d2d97964ce2fadc9fe3ffc4953f4e (diff) | |
| download | connman-6aa4055ef0544ae85457c25c510fe3db04949c43.tar.gz connman-6aa4055ef0544ae85457c25c510fe3db04949c43.tar.bz2 connman-6aa4055ef0544ae85457c25c510fe3db04949c43.zip | |
Base Code merged to SPIN 2.4submit/tizen/20150810.034432
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
Change-Id: I84a42375b5c59739e4caca1f726699ea7647ef17
Diffstat (limited to 'include/network.h')
| -rwxr-xr-x[-rw-r--r--] | include/network.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/network.h b/include/network.h index 5528f196..97b76e5b 100644..100755 --- 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); |