mac80211: fix incorrect mesh header length

PATCH New Luis Carlos Cobo 1 participant 1 message May 5, 2008 mac80211

Share & tools

Luis Carlos Cobo

author

2008-05-05 19:38 UTC #0 lore raw

PATCH 1/1 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 Luis Carlos Cobo <[email protected]>

---
 net/mac80211/mesh.c |    2 +-
 net/mac80211/util.c |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

net/mac80211/mesh.c +1 -1

index f76bc26..697ef67 100644
@@ -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

index cc9f715..24a465c 100644
@@ -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;
 	}
 }

Signature · 1 line

1.5.4.3