lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: fix incorrect mesh header length

Browse Source 
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: Luis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis Carlos Cobo
2008-05-05 12:02:35 -07:00
committed by John W. Linville
parent df44205455
commit ef26925477
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/mesh.c
View File

@@ -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); put_unaligned(cpu_to_le32(sdata->u.sta.mesh_seqnum), &meshhdr->seqnum);
sdata->u.sta.mesh_seqnum++; sdata->u.sta.mesh_seqnum++;
return 5; return 6;
} }
void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)

10
net/mac80211/util.c
View File

@@ -153,15 +153,15 @@ int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
/* 7.1.3.5a.2 */ /* 7.1.3.5a.2 */
switch (ae) { switch (ae) {
case 0: case 0:
return 5; return 6;
case 1: case 1:
return 11; return 12;
case 2: case 2:
return 17; return 18;
case 3: case 3:
return 23; return 24;
default: default:
return 5; return 6;
} }
} }