svn commit: r193451 - projects/mesh11s/sys/net80211

[Rui Paulo]

Author: rpaulo
Date: Thu Jun  4 18:27:53 2009
New Revision: 193451
URL: http://svn.freebsd.org/changeset/base/193451

Log:
  Rename meshframe struct.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211.h
  projects/mesh11s/sys/net80211/ieee80211_input.c
  projects/mesh11s/sys/net80211/ieee80211_output.c

Modified: projects/mesh11s/sys/net80211/ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.h	Thu Jun  4 18:27:17 2009	(r193450)
+++ projects/mesh11s/sys/net80211/ieee80211.h	Thu Jun  4 18:27:53 2009	(r193451)
@@ -107,7 +107,7 @@ struct ieee80211_qosframe_addr4 {
 	uint8_t		i_qos[2];
 } __packed;
 
-struct ieee80211_meshqosframe_addr4 {
+struct ieee80211_meshframe {
 	uint8_t		i_fc[2];
 	uint8_t		i_dur[2];
 	uint8_t		i_addr1[IEEE80211_ADDR_LEN];

Modified: projects/mesh11s/sys/net80211/ieee80211_input.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_input.c	Thu Jun  4 18:27:17 2009	(r193450)
+++ projects/mesh11s/sys/net80211/ieee80211_input.c	Thu Jun  4 18:27:53 2009	(r193451)
@@ -225,7 +225,7 @@ ieee80211_deliver_data(struct ieee80211v
 struct mbuf *
 ieee80211_decap(struct ieee80211vap *vap, struct mbuf *m, int hdrlen)
 {
-	struct ieee80211_meshqosframe_addr4 wh;	/* Max size address frames */
+	struct ieee80211_meshframe wh;	/* Max size address frames */
 	struct ether_header *eh;
 	struct llc *llc;
 

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 18:27:17 2009	(r193450)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Thu Jun  4 18:27:53 2009	(r193451)
@@ -1412,10 +1412,10 @@ ieee80211_encap(struct ieee80211vap *vap
 			M_SEQNO_SET(m, seqno);
 		}
 		if (vap->iv_opmode == IEEE80211_M_MBSS) {
-			struct ieee80211_meshqosframe_addr4 *mwh;
+			struct ieee80211_meshframe *mwh;
 			uint32_t seq;
 				
-			mwh = (struct ieee80211_meshqosframe_addr4 *)wh;
+			mwh = (struct ieee80211_meshframe *)wh;
 			mwh->i_mflags	= 0;	/* address extension bit */
 			mwh->i_mttl	= 160;
 			seq = ieee80211_mesh_getseq();