Date: Fri, 3 Jul 2009 15:21:57 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195313 - projects/mesh11s/sys/net80211 Message-ID: <200907031521.n63FLvBm081450@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Fri Jul 3 15:21:57 2009 New Revision: 195313 URL: http://svn.freebsd.org/changeset/base/195313 Log: Revert previous revision that added +2 to every frm pointer. Do this once on action.c. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_action.c projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_action.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_action.c Fri Jul 3 15:13:27 2009 (r195312) +++ projects/mesh11s/sys/net80211/ieee80211_action.c Fri Jul 3 15:21:57 2009 (r195313) @@ -272,6 +272,6 @@ ieee80211_recv_action(struct ieee80211_n f = vendor_recv_action[ia->ia_action]; break; } - return f(ni, frm, efrm); + return f(ni, frm + 2, efrm); #undef N } Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jul 3 15:13:27 2009 (r195312) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jul 3 15:21:57 2009 (r195313) @@ -1105,8 +1105,7 @@ mesh_recv_action_meshpeering_open(struct uint16_t args[3]; /* +2 for capabilites */ - meshpeer = mesh_parse_meshpeering_action(ni, wh, - frm + sizeof(struct ieee80211_action) + 2, efrm, &ie); + meshpeer = mesh_parse_meshpeering_action(ni, wh, frm+2, efrm, &ie); if (meshpeer == NULL) { return 0; } @@ -1240,8 +1239,7 @@ mesh_recv_action_meshpeering_confirm(str uint16_t args[3]; /* +2+2+2 for capabilites + status code + AID */ - meshpeer = mesh_parse_meshpeering_action(ni, wh, - frm + sizeof(struct ieee80211_action) + 2 + 2 + 2, efrm, &ie); + meshpeer = mesh_parse_meshpeering_action(ni, wh, frm+2+2+2, efrm, &ie); if (meshpeer == NULL) { return 0; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907031521.n63FLvBm081450>