Commit 53da4c45 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove unused argument to ieee80211_sta_connection_lost() 



We never use the bssid argument to ieee80211_sta_connection_lost()
so we might as well just remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 926101d2

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -1859,7 +1859,7 @@ void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata); 
void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata);

void ieee80211_sta_handle_tspec_ac_params(struct ieee80211_sub_if_data *sdata);

void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,

				   u8 *bssid, u8 reason, bool tx);

				   u8 reason, bool tx);



/* IBSS code */

void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);

net/mac80211/main.c

+2 −2
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ static void ieee80211_restart_work(struct work_struct *work) 
			if (sdata->vif.csa_active) {

				sdata_lock(sdata);

				ieee80211_sta_connection_lost(sdata,

							      sdata->u.mgd.bssid,

							      WLAN_REASON_UNSPECIFIED, false);

							      WLAN_REASON_UNSPECIFIED,

							      false);

				sdata_unlock(sdata);

			}

		}

net/mac80211/mlme.c

+4 −6
Original line number Diff line number Diff line
@@ -4503,7 +4503,7 @@ static void ieee80211_sta_timer(struct timer_list *t) 
}



void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,

				   u8 *bssid, u8 reason, bool tx)

				   u8 reason, bool tx)

{

	u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
@@ -4758,7 +4758,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) 
				mlme_dbg(sdata,

					 "No ack for nullfunc frame to AP %pM, disconnecting.\n",

					 bssid);

				ieee80211_sta_connection_lost(sdata, bssid,

				ieee80211_sta_connection_lost(sdata,

					WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,

					false);

			}
@@ -4768,7 +4768,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) 
			mlme_dbg(sdata,

				 "Failed to send nullfunc to AP %pM after %dms, disconnecting\n",

				 bssid, probe_wait_ms);

			ieee80211_sta_connection_lost(sdata, bssid,

			ieee80211_sta_connection_lost(sdata,

				WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, false);

		} else if (ifmgd->probe_send_count < max_tries) {

			mlme_dbg(sdata,
@@ -4785,7 +4785,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) 
				 "No probe response from AP %pM after %dms, disconnecting.\n",

				 bssid, probe_wait_ms);



			ieee80211_sta_connection_lost(sdata, bssid,

			ieee80211_sta_connection_lost(sdata,

				WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, false);

		}

	}
@@ -4940,7 +4940,6 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) 
		sdata->flags &= ~IEEE80211_SDATA_DISCONNECT_RESUME;

		mlme_dbg(sdata, "driver requested disconnect after resume\n");

		ieee80211_sta_connection_lost(sdata,

					      ifmgd->bssid,

					      WLAN_REASON_UNSPECIFIED,

					      true);

		sdata_unlock(sdata);
@@ -4951,7 +4950,6 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) 
		sdata->flags &= ~IEEE80211_SDATA_DISCONNECT_HW_RESTART;

		mlme_dbg(sdata, "driver requested disconnect after hardware restart\n");

		ieee80211_sta_connection_lost(sdata,

					      ifmgd->bssid,

					      WLAN_REASON_UNSPECIFIED,

					      true);

		sdata_unlock(sdata);