Merge RP1A.190822.001
Change-Id: I4c0156c27115ef97d179ff146bb367cd05c21786
diff --git a/event.c b/event.c
index f73e078..37d3a31 100644
--- a/event.c
+++ b/event.c
@@ -49,8 +49,10 @@
char macbuf[6*3];
uint16_t tmp;
- if (!attr)
+ if (!attr) {
printf(" [no frame]");
+ return;
+ }
frame = nla_data(attr);
len = nla_len(attr);
@@ -242,7 +244,7 @@
nla_for_each_nested(match,
tb[NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS],
rem_nst) {
- nla_parse(tb_match, NUM_NL80211_ATTR, nla_data(match),
+ nla_parse(tb_match, NL80211_ATTR_MAX, nla_data(match),
nla_len(match),
NULL);
printf("\t\tSSID: \"");
diff --git a/iw.c b/iw.c
index dc99566..4373374 100644
--- a/iw.c
+++ b/iw.c
@@ -544,8 +544,9 @@
err = __handle_cmd(&nlstate, II_WDEV, argc, argv, &cmd);
} else {
int idx;
- enum id_input idby = II_NONE;
+ enum id_input idby;
detect:
+ idby = II_NONE;
if ((idx = if_nametoindex(argv[0])) != 0)
idby = II_NETDEV;
else if ((idx = phy_lookup(argv[0])) >= 0)
diff --git a/wowlan.c b/wowlan.c
index 203014b..7daad17 100644
--- a/wowlan.c
+++ b/wowlan.c
@@ -388,7 +388,7 @@
int rem_match;
printf(" * wake up on network detection\n");
- nla_parse(nd, NUM_NL80211_ATTR,
+ nla_parse(nd, NL80211_ATTR_MAX,
nla_data(trig[NL80211_WOWLAN_TRIG_NET_DETECT]),
nla_len(trig[NL80211_WOWLAN_TRIG_NET_DETECT]), NULL);
@@ -405,7 +405,7 @@
nla_for_each_nested(match,
nd[NL80211_ATTR_SCHED_SCAN_MATCH],
rem_match) {
- nla_parse(tb, NUM_NL80211_ATTR, nla_data(match),
+ nla_parse(tb, NL80211_ATTR_MAX, nla_data(match),
nla_len(match),
NULL);
printf("\t\tSSID: ");