---

yaml --- r: 96551 b: refs/heads/master c: ef26925 h: refs/heads/master i: 96549: ab85e99 96547: a8350fe 96543: 86f23c7 v: v3
git-mirror · May 13, 2008 · 5955a12 · 5955a12
1 parent 89a1c9f
commit 5955a12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df44205455773852a6af10a7c6ed768fe8a86b31
+refs/heads/master: ef269254772a0d2253c85cafe160e3f6528eb292
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
@@ -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)

diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
@@ -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;
 	}
 }