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

Commit 785a7de9 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 518eefe1 7ce8c7a3

net/mac80211/cfg.c

+4 −5
Original line number Diff line number Diff line
@@ -1378,6 +1378,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
	else

		memset(next_hop, 0, ETH_ALEN);



	memset(pinfo, 0, sizeof(*pinfo));



	pinfo->generation = mesh_paths_generation;



	pinfo->filled = MPATH_INFO_FRAME_QLEN |
@@ -1396,7 +1398,6 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
	pinfo->discovery_timeout =

			jiffies_to_msecs(mpath->discovery_timeout);

	pinfo->discovery_retries = mpath->discovery_retries;

	pinfo->flags = 0;

	if (mpath->flags & MESH_PATH_ACTIVE)

		pinfo->flags |= NL80211_MPATH_FLAG_ACTIVE;

	if (mpath->flags & MESH_PATH_RESOLVING)
@@ -1405,10 +1406,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
		pinfo->flags |= NL80211_MPATH_FLAG_SN_VALID;

	if (mpath->flags & MESH_PATH_FIXED)

		pinfo->flags |= NL80211_MPATH_FLAG_FIXED;

	if (mpath->flags & MESH_PATH_RESOLVING)

		pinfo->flags |= NL80211_MPATH_FLAG_RESOLVING;



	pinfo->flags = mpath->flags;

	if (mpath->flags & MESH_PATH_RESOLVED)

		pinfo->flags |= NL80211_MPATH_FLAG_RESOLVED;

}



static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev,

net/mac80211/mlme.c

+4 −0
Original line number Diff line number Diff line
@@ -3248,6 +3248,8 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, 
	goto out_unlock;



 err_clear:

	memset(ifmgd->bssid, 0, ETH_ALEN);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);

	ifmgd->auth_data = NULL;

 err_free:

	kfree(auth_data);
@@ -3439,6 +3441,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	err = 0;

	goto out;

 err_clear:

	memset(ifmgd->bssid, 0, ETH_ALEN);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);

	ifmgd->assoc_data = NULL;

 err_free:

	kfree(assoc_data);

net/wireless/nl80211.c

+3 −1
Original line number Diff line number Diff line
@@ -5633,8 +5633,10 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) 
		       sizeof(connect.ht_capa_mask));



	if (info->attrs[NL80211_ATTR_HT_CAPABILITY]) {

		if (!info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK])

		if (!info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK]) {

			kfree(connkeys);

			return -EINVAL;

		}

		memcpy(&connect.ht_capa,

		       nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY]),

		       sizeof(connect.ht_capa));