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

Commit c999d51f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cfg80211: size various nl80211 messages correctly"

parents fdc29328 3ebbbf7f

net/wireless/nl80211.c

+8 −8
Original line number Diff line number Diff line
@@ -12132,7 +12132,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, 
	struct sk_buff *msg;

	void *hdr;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);

	msg = nlmsg_new(100 + len, gfp);

	if (!msg)

		return;
@@ -12286,7 +12286,7 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev, 
	struct sk_buff *msg;

	void *hdr;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);

	msg = nlmsg_new(100 + req_ie_len + resp_ie_len, gfp);

	if (!msg)

		return;
@@ -12331,7 +12331,7 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev, 
	struct sk_buff *msg;

	void *hdr;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);

	msg = nlmsg_new(100 + req_ie_len + resp_ie_len, gfp);

	if (!msg)

		return;
@@ -12369,7 +12369,7 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev, 
	struct sk_buff *msg;

	void *hdr;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	msg = nlmsg_new(100 + ie_len, GFP_KERNEL);

	if (!msg)

		return;
@@ -12446,7 +12446,7 @@ void cfg80211_notify_new_peer_candidate(struct net_device *dev, const u8 *addr, 


	trace_cfg80211_notify_new_peer_candidate(dev, addr);



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);

	msg = nlmsg_new(100 + ie_len, gfp);

	if (!msg)

		return;
@@ -12815,7 +12815,7 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev, 
	struct sk_buff *msg;

	void *hdr;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);

	msg = nlmsg_new(100 + len, gfp);

	if (!msg)

		return -ENOMEM;
@@ -12858,7 +12858,7 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie, 


	trace_cfg80211_mgmt_tx_status(wdev, cookie, ack);



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);

	msg = nlmsg_new(100 + len, gfp);

	if (!msg)

		return;
@@ -13662,7 +13662,7 @@ void cfg80211_ft_event(struct net_device *netdev, 
	if (!ft_event->target_ap)

		return;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	msg = nlmsg_new(100 + ft_event->ric_ies_len, GFP_KERNEL);

	if (!msg)

		return;