Commit be099e82 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

mac80211: add helper for reseting the connection monitor 



This will be used in another place later. The connection
monitor was added as of 2.6.35 so these fixes will be
applicable to >= 2.6.35.

Cc: stable@kernel.org
Cc: Paul Stewart <pstew@google.com>
Cc: Amod Bodas <amod.bodas@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 48a6a468

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,7 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata); 
void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata);

void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,

				  struct sk_buff *skb);

void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata);



/* IBSS code */

void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);

net/mac80211/mlme.c

+10 −5
Original line number Diff line number Diff line
@@ -124,6 +124,15 @@ static void mod_beacon_timer(struct ieee80211_sub_if_data *sdata) 
		  round_jiffies_up(jiffies + IEEE80211_BEACON_LOSS_TIME));

}



void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata)

{

	if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)

		return;



	mod_timer(&sdata->u.mgd.conn_mon_timer,

		  round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME));

}



static int ecw2cw(int ecw)

{

	return (1 << ecw) - 1;
@@ -1018,11 +1027,7 @@ void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata, 
	if (is_multicast_ether_addr(hdr->addr1))

		return;



	if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)

		return;



	mod_timer(&sdata->u.mgd.conn_mon_timer,

		  round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME));

	ieee80211_sta_reset_conn_monitor(sdata);

}



static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)

CRA Git | Maintained and supported by SUSTech CRA and CCSE