Merge branch 'linux-2.6' into powerpc-next

[linux-2.6-omap-h63xx.git] / net / mac80211 / mesh.c

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index f76bc26ae4d219301dcde04bda7b62d350007ba1..697ef67f96b6796bc60aaefa88720e67191ff007 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/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)