Skip to contentSkip to conversation

ath10k:mac: disassoc dbg msg after return check

PATCH In review Eduardo Abinader 2 participants 3 messages Nov 11, 2019 1 message not in the archive Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath10k:mac: disassoc dbg msg after return check

---
 drivers/net/wireless/ath/ath10k/mac.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +3 -3
index 5e3450cfb07b..038d5c27bed7 100644
@@ -6786,13 +6786,13 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
 		/*
 		 * Disassociation.
 		 */
-		ath10k_dbg(ar, ATH10K_DBG_MAC, "mac sta %pM disassociated\n",
-			   sta->addr);
-
 		ret = ath10k_station_disassoc(ar, vif, sta);
 		if (ret)
 			ath10k_warn(ar, "failed to disassociate station: %pM vdev %i: %i\n",
 				    sta->addr, arvif->vdev_id, ret);
+		else
+			ath10k_dbg(ar, ATH10K_DBG_MAC, "mac sta %pM disassociated\n",
+			   sta->addr);
 	}
 exit:
 	mutex_unlock(&ar->conf_mutex);
Signature · 1 line
2.20.1
#1 lore raw
Quoted 1 line · Eduardo Abinader

No empty commit logs, please.

Quoted 6 lines
drivers/net/wireless/ath/ath10k/mac.c +0 -0
@@ -6786,13 +6786,13 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
 		/*
 		 * Disassociation.
 		 */

drivers/net/wireless/ath/ath10k/mac.c static int ath10k_sta_state(struct ieee80211_hw *hw, · line 6795

Quoted 10 lines
drivers/net/wireless/ath/ath10k/mac.c +3 -3
-		ath10k_dbg(ar, ATH10K_DBG_MAC, "mac sta %pM disassociated\n",
-			   sta->addr);
-
 		ret = ath10k_station_disassoc(ar, vif, sta);
 		if (ret)
 			ath10k_warn(ar, "failed to disassociate station: %pM vdev %i: %i\n",
 				    sta->addr, arvif->vdev_id, ret);
+		else
+			ath10k_dbg(ar, ATH10K_DBG_MAC, "mac sta %pM disassociated\n",
+			   sta->addr);

I don't understand, how is this better?

Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k

A message that is not in the archive (sent off-list or not yet received): CAGoNHni94JihdS-XovcC_zZ9YkMhSeoupfsMn2ioh9koA0EwmQ@mail.gmail.com

#3 lore raw
Quoted 26 lines · Eduardo Abinader
Quoted 24 lines · Kalle Valo
Quoted 1 line · Eduardo Abinader

No empty commit logs, please.

drivers/net/wireless/ath/ath10k/mac.c static int ath10k_sta_state(struct ieee80211_hw

Quoted 3 lines
drivers/net/wireless/ath/ath10k/mac.c +0 -0
@@ -6786,13 +6786,13 @@ static int ath10k_sta_state(struct ieee80211_hw

*hw,

drivers/net/wireless/ath/ath10k/mac.c static int ath10k_sta_state(struct ieee80211_hw *hw,

Quoted 4 lines
drivers/net/wireless/ath/ath10k/mac.c +0 -1
              /*
               * Disassociation.
               */
-             ath10k_dbg(ar, ATH10K_DBG_MAC, "mac sta %pM

disassociated\n",

drivers/net/wireless/ath/ath10k/mac.c static int ath10k_sta_state(struct ieee80211_hw *hw,

Quoted 5 lines
drivers/net/wireless/ath/ath10k/mac.c +0 -2
-                        sta->addr);
-
              ret = ath10k_station_disassoc(ar, vif, sta);
              if (ret)
                      ath10k_warn(ar, "failed to disassociate station:

%pM vdev %i: %i\n",

Quoted 3 lines
drivers/net/wireless/ath/ath10k/mac.c +2 -0
                                  sta->addr, arvif->vdev_id, ret);
+             else
+                     ath10k_dbg(ar, ATH10K_DBG_MAC, "mac sta %pM
Quoted 7 lines
Quoted 5 lines

disassociated\n",

drivers/net/wireless/ath/ath10k/mac.c static int ath10k_sta_state(struct ieee80211_hw *hw, · line 6795

Quoted 1 line
drivers/net/wireless/ath/ath10k/mac.c +1 -0
+                        sta->addr);

I don't understand, how is this better?

Either one msg or the other? I think a bit cleaner log.

I don't see it that way, the else branch makes the code harder to read and for consistency it's better to always print the debug log.

Quoted 3 lines

--000000000000b3b5a805970e8f8f
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Please don't use HTML, I think the mailing lists drop all HTML mail automatically.

Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k