Skip to content

Commit

Permalink
mac80211: fix incorrect mesh header length
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luis Carlos Cobo authored and John W. Linville committed May 13, 2008
1 parent df44205 commit ef26925
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion net/mac80211/mesh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions net/mac80211/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit ef26925

Please sign in to comment.