Commit 79f6440c authored by Alina Friedrichsen's avatar Alina Friedrichsen Committed by John W. Linville
Browse files

mac80211: Introduce a generic commit() to apply changes 



This patch introduces a generic commit() function which initiate a
new network joining process. It should be called after some interface
config changes, so that the changes get applied more cleanly. Currently
set_ssid() and set_bssid() call it. Others can be added in future
patches.

In version 1 the header files was forgotten, sorry.

Signed-off-by: default avatarAlina Friedrichsen <x-alina@gmx.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5f9724dd

net/mac80211/ibss.c

+19 −11
Original line number Diff line number Diff line
@@ -788,6 +788,23 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata) 
			IEEE80211_IBSS_AUTO_CHANNEL_SEL;

}



int ieee80211_ibss_commit(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;



	ifibss->flags &= ~IEEE80211_IBSS_PREV_BSSID_SET;



	if (ifibss->ssid_len)

		ifibss->flags |= IEEE80211_IBSS_SSID_SET;

	else

		ifibss->flags &= ~IEEE80211_IBSS_SSID_SET;



	ifibss->ibss_join_req = jiffies;

	ifibss->state = IEEE80211_IBSS_MLME_SEARCH;



	return ieee80211_sta_find_ibss(sdata);

}



int ieee80211_ibss_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len)

{

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
@@ -801,16 +818,7 @@ int ieee80211_ibss_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, siz 
		ifibss->ssid_len = len;

	}



	ifibss->flags &= ~IEEE80211_IBSS_PREV_BSSID_SET;



	if (len)

		ifibss->flags |= IEEE80211_IBSS_SSID_SET;

	else

		ifibss->flags &= ~IEEE80211_IBSS_SSID_SET;



	ifibss->ibss_join_req = jiffies;

	ifibss->state = IEEE80211_IBSS_MLME_SEARCH;

	return ieee80211_sta_find_ibss(sdata);

	return ieee80211_ibss_commit(sdata);

}



int ieee80211_ibss_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len)
@@ -842,7 +850,7 @@ int ieee80211_ibss_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid) 
		}

	}



	return ieee80211_ibss_set_ssid(sdata, ifibss->ssid, ifibss->ssid_len);

	return ieee80211_ibss_commit(sdata);

}



/* scan finished notification */

net/mac80211/ieee80211_i.h

+2 −0
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata); 
ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata,

					  struct sk_buff *skb,

					  struct ieee80211_rx_status *rx_status);

int ieee80211_sta_commit(struct ieee80211_sub_if_data *sdata);

int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len);

int ieee80211_sta_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len);

int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid);
@@ -944,6 +945,7 @@ void ieee80211_send_pspoll(struct ieee80211_local *local, 
			   struct ieee80211_sub_if_data *sdata);



/* IBSS code */

int ieee80211_ibss_commit(struct ieee80211_sub_if_data *sdata);

int ieee80211_ibss_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len);

int ieee80211_ibss_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len);

int ieee80211_ibss_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid);

net/mac80211/mlme.c

+16 −9
Original line number Diff line number Diff line
@@ -1855,6 +1855,20 @@ void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata) 
	}

}



int ieee80211_sta_commit(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;



	ifmgd->flags &= ~IEEE80211_STA_PREV_BSSID_SET;



	if (ifmgd->ssid_len)

		ifmgd->flags |= IEEE80211_STA_SSID_SET;

	else

		ifmgd->flags &= ~IEEE80211_STA_SSID_SET;



	return 0;

}



int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len)

{

	struct ieee80211_if_managed *ifmgd;
@@ -1870,14 +1884,7 @@ int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size 
		ifmgd->ssid_len = len;

	}



	ifmgd->flags &= ~IEEE80211_STA_PREV_BSSID_SET;



	if (len)

		ifmgd->flags |= IEEE80211_STA_SSID_SET;

	else

		ifmgd->flags &= ~IEEE80211_STA_SSID_SET;



	return 0;

	return ieee80211_sta_commit(sdata);

}



int ieee80211_sta_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len)
@@ -1907,7 +1914,7 @@ int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid) 
		}

	}



	return ieee80211_sta_set_ssid(sdata, ifmgd->ssid, ifmgd->ssid_len);

	return ieee80211_sta_commit(sdata);

}



int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, char *ie, size_t len)

CRA Git | Maintained and supported by SUSTech CRA and CCSE