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

Commit 751ad819 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2016-06-29-v2' of... 

Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just two small fixes
 * fix mesh peer link counter, decrement wasn't always done at all
 * fix ethertype (length) for packets without RFC 1042 or bridge
   tunnel header
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d913d3a7 c041778c

net/mac80211/mesh.c

+5 −2
Original line number Diff line number Diff line
@@ -148,14 +148,17 @@ u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata) 
void mesh_sta_cleanup(struct sta_info *sta)

{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	u32 changed;

	u32 changed = 0;



	/*

	 * maybe userspace handles peer allocation and peering, but in either

	 * case the beacon is still generated by the kernel and we might need

	 * an update.

	 */

	changed = mesh_accept_plinks_update(sdata);

	if (sdata->u.mesh.user_mpm &&

	    sta->mesh->plink_state == NL80211_PLINK_ESTAB)

		changed |= mesh_plink_dec_estab_count(sdata);

	changed |= mesh_accept_plinks_update(sdata);

	if (!sdata->u.mesh.user_mpm) {

		changed |= mesh_plink_deactivate(sta);

		del_timer_sync(&sta->mesh->plink_timer);

net/wireless/util.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr, 
		 * replace EtherType */

		hdrlen += ETH_ALEN + 2;

	else

		tmp.h_proto = htons(skb->len);

		tmp.h_proto = htons(skb->len - hdrlen);



	pskb_pull(skb, hdrlen);