Merge to ns3dev

src/devices/mesh/802.11s/_placeholder_

@@ -0,0 +1,2 @@
+TODO: delete me when first useful file will be created here
+This is a placeholder file used only to keep the 802.11s directory present.

src/devices/mesh/mesh.h

@@ -0,0 +1,30 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/* 
+ * Copyright (c) 2009 IITP RAS
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * Author: Pavel Boyko <boyko@iitp.ru>
+ * 
+ * This is toplevel mesh module description
+ */
+
+/**
+ * \ingroup devices
+ * \defgroup mesh Mesh
+ * 
+ * \brief Level 2 mobile ad hoc wireless networking
+ * 
+ * TODO module documentation here
+ */

src/devices/wifi/mesh-wifi-mac.h

@@ -19,7 +19,10 @@
  *          Evgeny Khorov <horov@frtk.ru>
  */
 
-
+/**
+ * \addtogroup mesh
+ * \{
+ */
 #ifndef MAC_HIGH_MESH_H
 #define MAC_HIGH_MESH_H
 
@@ -47,6 +50,7 @@ namespace ns3 {
 	class MacLow;
 	class WifiPeerManager;
 	/**
+	 * \ingroup mesh
 	 * \brief Implements MAC-layer of mesh point: beaconing and
 	 * peer link management.
 	 *
@@ -384,3 +388,4 @@ namespace ns3 {
 
 
 #endif /* MAC_HIGH_MESH_H */
+//\}

src/devices/wifi/mesh-wifi-perr-information-element.h

@@ -33,6 +33,7 @@
 
 namespace ns3
 {
+
 class WifiPerrInformationElement : public Header
 {
 	public: