OSDN Git Service
(root)
/
android-x86
/
external-wpa_supplicant_8.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
am 18493732: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
[android-x86/external-wpa_supplicant_8.git]
/
wpa_supplicant
/
config_none.c
diff --git
a/wpa_supplicant/config_none.c
b/wpa_supplicant/config_none.c
index
589ea36
..
2aac28f
100644
(file)
--- a/
wpa_supplicant/config_none.c
+++ b/
wpa_supplicant/config_none.c
@@
-17,11
+17,16
@@
#include "base64.h"
#include "base64.h"
-struct wpa_config * wpa_config_read(const char *name)
+struct wpa_config * wpa_config_read(const char *name
, struct wpa_config *cfgp
)
{
struct wpa_config *config;
{
struct wpa_config *config;
- config = wpa_config_alloc_empty(NULL, NULL);
+ if (name == NULL)
+ return NULL;
+ if (cfgp)
+ config = cfgp;
+ else
+ config = wpa_config_alloc_empty(NULL, NULL);
if (config == NULL)
return NULL;
/* TODO: fill in configuration data */
if (config == NULL)
return NULL;
/* TODO: fill in configuration data */