Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d6e342 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: use proper allocation flags 



Instead of hardcoding GFP_ATOMIC everywhere, add a
new function parameter that gets the flags from the
caller. Obviously then I need to update all callers
(all of them in mac80211), and it turns out that now
it's ok to use GFP_KERNEL in almost all places.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dad82330

include/net/cfg80211.h

+14 −7
Original line number Diff line number Diff line
@@ -1572,64 +1572,70 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *bss); 
 * @dev: network device

 * @buf: authentication frame (header + body)

 * @len: length of the frame data

 * @gfp: allocation flags

 *

 * This function is called whenever an authentication has been processed in

 * station mode. The driver is required to call either this function or

 * cfg80211_send_auth_timeout() to indicate the result of cfg80211_ops::auth()

 * call.

 */

void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);

void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len, gfp_t gfp);



/**

 * cfg80211_send_auth_timeout - notification of timed out authentication

 * @dev: network device

 * @addr: The MAC address of the device with which the authentication timed out

 * @gfp: allocation flags

 */

void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);

void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr, gfp_t gfp);



/**

 * cfg80211_send_rx_assoc - notification of processed association

 * @dev: network device

 * @buf: (re)association response frame (header + body)

 * @len: length of the frame data

 * @gfp: allocation flags

 *

 * This function is called whenever a (re)association response has been

 * processed in station mode. The driver is required to call either this

 * function or cfg80211_send_assoc_timeout() to indicate the result of

 * cfg80211_ops::assoc() call.

 */

void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len);

void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len, gfp_t gfp);



/**

 * cfg80211_send_assoc_timeout - notification of timed out association

 * @dev: network device

 * @addr: The MAC address of the device with which the association timed out

 * @gfp: allocation flags

 */

void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr);

void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr, gfp_t gfp);



/**

 * cfg80211_send_deauth - notification of processed deauthentication

 * @dev: network device

 * @buf: deauthentication frame (header + body)

 * @len: length of the frame data

 * @gfp: allocation flags

 *

 * This function is called whenever deauthentication has been processed in

 * station mode. This includes both received deauthentication frames and

 * locally generated ones.

 */

void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);

void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len, gfp_t gfp);



/**

 * cfg80211_send_disassoc - notification of processed disassociation

 * @dev: network device

 * @buf: disassociation response frame (header + body)

 * @len: length of the frame data

 * @gfp: allocation flags

 *

 * This function is called whenever disassociation has been processed in

 * station mode. This includes both received disassociation frames and locally

 * generated ones.

 */

void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len);

void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len, gfp_t gfp);



/**

 * cfg80211_hold_bss - exclude bss from expiration
@@ -1655,6 +1661,7 @@ void cfg80211_unhold_bss(struct cfg80211_bss *bss); 
 * @key_type: The key type that the received frame used

 * @key_id: Key identifier (0..3)

 * @tsc: The TSC value of the frame that generated the MIC failure (6 octets)

 * @gfp: allocation flags

 *

 * This function is called whenever the local MAC detects a MIC failure in a

 * received frame. This matches with MLME-MICHAELMICFAILURE.indication()
@@ -1662,7 +1669,7 @@ void cfg80211_unhold_bss(struct cfg80211_bss *bss); 
 */

void cfg80211_michael_mic_failure(struct net_device *dev, const u8 *addr,

				  enum nl80211_key_type key_type, int key_id,

				  const u8 *tsc);

				  const u8 *tsc, gfp_t gfp);



/**

 * cfg80211_ibss_joined - notify cfg80211 that device joined an IBSS

net/mac80211/event.c

+3 −2
Original line number Diff line number Diff line
@@ -16,11 +16,12 @@ 
 * driver or is still in the frame), it should provide that information.

 */

void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,

				     struct ieee80211_hdr *hdr, const u8 *tsc)

				     struct ieee80211_hdr *hdr, const u8 *tsc,

				     gfp_t gfp)

{

	cfg80211_michael_mic_failure(sdata->dev, hdr->addr2,

				     (hdr->addr1[0] & 0x01) ?

				     NL80211_KEYTYPE_GROUP :

				     NL80211_KEYTYPE_PAIRWISE,

				     keyidx, tsc);

				     keyidx, tsc, gfp);

}

net/mac80211/ieee80211_i.h

+2 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,8 @@ u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, 
int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,

			     int rate, int erp, int short_preamble);

void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,

				     struct ieee80211_hdr *hdr, const u8 *tsc);

				     struct ieee80211_hdr *hdr, const u8 *tsc,

				     gfp_t gfp);

void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata);

void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,

		      int encrypt);

net/mac80211/mlme.c

+19 −11
Original line number Diff line number Diff line
@@ -419,9 +419,11 @@ static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, 
	mgmt->u.deauth.reason_code = cpu_to_le16(reason);



	if (stype == IEEE80211_STYPE_DEAUTH)

		cfg80211_send_deauth(sdata->dev, (u8 *) mgmt, skb->len);

		cfg80211_send_deauth(sdata->dev, (u8 *) mgmt, skb->len,

				     GFP_KERNEL);

	else

		cfg80211_send_disassoc(sdata->dev, (u8 *) mgmt, skb->len);

		cfg80211_send_disassoc(sdata->dev, (u8 *) mgmt, skb->len,

				       GFP_KERNEL);

	ieee80211_tx_skb(sdata, skb, ifmgd->flags & IEEE80211_STA_MFP_ENABLED);

}
@@ -1006,7 +1008,8 @@ static void ieee80211_direct_probe(struct ieee80211_sub_if_data *sdata) 
		       sdata->dev->name, ifmgd->bssid);

		ifmgd->state = IEEE80211_STA_MLME_DISABLED;

		ieee80211_recalc_idle(local);

		cfg80211_send_auth_timeout(sdata->dev, ifmgd->bssid);

		cfg80211_send_auth_timeout(sdata->dev, ifmgd->bssid,

					   GFP_KERNEL);



		/*

		 * Most likely AP is not in the range so remove the
@@ -1055,7 +1058,8 @@ static void ieee80211_authenticate(struct ieee80211_sub_if_data *sdata) 
		       sdata->dev->name, ifmgd->bssid);

		ifmgd->state = IEEE80211_STA_MLME_DISABLED;

		ieee80211_recalc_idle(local);

		cfg80211_send_auth_timeout(sdata->dev, ifmgd->bssid);

		cfg80211_send_auth_timeout(sdata->dev, ifmgd->bssid,

					   GFP_KERNEL);

		ieee80211_rx_bss_remove(sdata, ifmgd->bssid,

				sdata->local->hw.conf.channel->center_freq,

				ifmgd->ssid, ifmgd->ssid_len);
@@ -1243,7 +1247,8 @@ static void ieee80211_associate(struct ieee80211_sub_if_data *sdata) 
		       sdata->dev->name, ifmgd->bssid);

		ifmgd->state = IEEE80211_STA_MLME_DISABLED;

		ieee80211_recalc_idle(local);

		cfg80211_send_assoc_timeout(sdata->dev, ifmgd->bssid);

		cfg80211_send_assoc_timeout(sdata->dev, ifmgd->bssid,

					    GFP_KERNEL);

		ieee80211_rx_bss_remove(sdata, ifmgd->bssid,

				sdata->local->hw.conf.channel->center_freq,

				ifmgd->ssid, ifmgd->ssid_len);
@@ -1517,12 +1522,14 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, 
	case WLAN_AUTH_LEAP:

	case WLAN_AUTH_FT:

		ieee80211_auth_completed(sdata);

		cfg80211_send_rx_auth(sdata->dev, (u8 *) mgmt, len);

		cfg80211_send_rx_auth(sdata->dev, (u8 *) mgmt, len,

				      GFP_KERNEL);

		break;

	case WLAN_AUTH_SHARED_KEY:

		if (ifmgd->auth_transaction == 4) {

			ieee80211_auth_completed(sdata);

			cfg80211_send_rx_auth(sdata->dev, (u8 *) mgmt, len);

			cfg80211_send_rx_auth(sdata->dev, (u8 *) mgmt, len,

					      GFP_KERNEL);

		} else

			ieee80211_auth_challenge(sdata, mgmt, len);

		break;
@@ -1560,7 +1567,7 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata, 


	ieee80211_set_disassoc(sdata, true, false, 0);

	ifmgd->flags &= ~IEEE80211_STA_AUTHENTICATED;

	cfg80211_send_deauth(sdata->dev, (u8 *) mgmt, len);

	cfg80211_send_deauth(sdata->dev, (u8 *) mgmt, len, GFP_KERNEL);

}
@@ -1591,7 +1598,7 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, 
	}



	ieee80211_set_disassoc(sdata, false, false, reason_code);

	cfg80211_send_disassoc(sdata->dev, (u8 *) mgmt, len);

	cfg80211_send_disassoc(sdata->dev, (u8 *) mgmt, len, GFP_KERNEL);

}
@@ -1660,7 +1667,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
		 * association next time. This works around some broken APs

		 * which do not correctly reject reassociation requests. */

		ifmgd->flags &= ~IEEE80211_STA_PREV_BSSID_SET;

		cfg80211_send_rx_assoc(sdata->dev, (u8 *) mgmt, len);

		cfg80211_send_rx_assoc(sdata->dev, (u8 *) mgmt, len,

				       GFP_KERNEL);

		if (ifmgd->flags & IEEE80211_STA_EXT_SME) {

			/* Wait for SME to decide what to do next */

			ifmgd->state = IEEE80211_STA_MLME_DISABLED;
@@ -1823,7 +1831,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
	ifmgd->last_beacon = jiffies;



	ieee80211_associated(sdata);

	cfg80211_send_rx_assoc(sdata->dev, (u8 *) mgmt, len);

	cfg80211_send_rx_assoc(sdata->dev, (u8 *) mgmt, len, GFP_KERNEL);

}

net/mac80211/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1863,7 +1863,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev, 
	    !ieee80211_is_auth(hdr->frame_control))

		goto ignore;



	mac80211_ev_michael_mic_failure(rx->sdata, keyidx, hdr, NULL);

	mac80211_ev_michael_mic_failure(rx->sdata, keyidx, hdr, NULL,

					GFP_ATOMIC);

 ignore:

	dev_kfree_skb(rx->skb);

	rx->skb = NULL;