From 3ee18569f5d181ba01981d9bcbc60243f7ac1c7a Mon Sep 17 00:00:00 2001 From: Eduardo Abinader Date: Sun, 31 Aug 2014 23:20:21 -0400 Subject: [PATCH] nl80211: Register eloop after hs20 action frame Even when hs20 action frame is unable to be registered, for whatever reason, it should be possible to register event handle for received driver messages. This patch also avoids a segmentation fault, when p2p and hs20 were enabled and GO NEG was unable to create p2p iface, the destroy eloop was crashing by reading an invalid handle. Signed-off-by: Eduardo Abinader --- src/drivers/driver_nl80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 574fe4a3a..d7747b660 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -4573,7 +4573,7 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss) #ifdef CONFIG_HS20 /* WNM-Notification */ if (nl80211_register_action_frame(bss, (u8 *) "\x0a\x1a", 2) < 0) - return -1; + ret = -1; #endif /* CONFIG_HS20 */ nl80211_mgmt_handle_register_eloop(bss);