diff --git a/[refs] b/[refs] index e005a8433a57..ead4d4b60ad9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9ad2f5df89c66b5eae6ac5aaabe62508baba4ef +refs/heads/master: 57361c6edc5801636eeeef0100d3071ab0b5c573 diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/drivers/net/wireless/libertas/assoc.c index 4fcc6a653d99..48fc6d171d58 100644 --- a/trunk/drivers/net/wireless/libertas/assoc.c +++ b/trunk/drivers/net/wireless/libertas/assoc.c @@ -132,7 +132,7 @@ static int assoc_helper_bssid(wlan_private *priv, int ret = 0; struct bss_descriptor * bss; - lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID" MAC_FMT "\n", + lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID " MAC_FMT "\n", MAC_ARG(assoc_req->bssid)); /* Search for index position in list for requested MAC */ @@ -627,7 +627,6 @@ lbs_deb_assoc("ASSOC(:%d) wpa_keys: ret = %d\n", __LINE__, ret); cmd_802_11_get_log, 0, cmd_option_waitforrsp, 0, NULL); } else { - ret = -1; } }