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

Commit ef269254 authored by Luis Carlos Cobo's avatar Luis Carlos Cobo Committed by John W. Linville
Browse files

mac80211: fix incorrect mesh header length 



This should have been updated at the same time we were transitioning from 3 byte
to 4 byte mesh sequence number. Pointed out by Johannes Berg.

Signed-off-by: default avatarLuis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent df442054

net/mac80211/mesh.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr, 
	put_unaligned(cpu_to_le32(sdata->u.sta.mesh_seqnum), &meshhdr->seqnum);

	sdata->u.sta.mesh_seqnum++;



	return 5;

	return 6;

}



void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)

net/mac80211/util.c

+5 −5
Original line number Diff line number Diff line
@@ -153,15 +153,15 @@ int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr) 
	/* 7.1.3.5a.2 */

	switch (ae) {

	case 0:

		return 5;

		return 6;

	case 1:

		return 11;

		return 12;

	case 2:

		return 17;

		return 18;

	case 3:

		return 23;

		return 24;

	default:

		return 5;

		return 6;

	}

}