--- a/src/devices/mesh/dot11s/dot11s-mac-header.h	Wed Jul 22 13:31:31 2009 +0400
+++ b/src/devices/mesh/dot11s/dot11s-mac-header.h	Wed Jul 22 14:52:42 2009 +0400
@@ -29,10 +29,10 @@
 namespace dot11s {
 /**
  * \ingroup dot11s
- * 
+ *
  * \brief Mesh Control field, see IEEE 802.11s draft 3.0 section 7.1.3.5b
- * 
- * Header format: | Mesh flags: 1 | TTL: 1 | Sequence number: 4 | Address ext.: 0, 6, 12 or 18 | 
+ *
+ * Header format: | Mesh flags: 1 | TTL: 1 | Sequence number: 4 | Address ext.: 0, 6, 12 or 18 |
  */
 class MeshHeader : public Header
 {
@@ -43,28 +43,28 @@
   virtual TypeId GetInstanceTypeId () const;
   virtual void Print (std::ostream &os) const;
 
-  void   SetAddr4 (Mac48Address address);
-  void   SetAddr5 (Mac48Address address);
-  void   SetAddr6 (Mac48Address address);
-  Mac48Address  GetAddr4 () const;
-  Mac48Address  GetAddr5 () const;
-  Mac48Address  GetAddr6 () const;
+  void SetAddr4 (Mac48Address address);
+  void SetAddr5 (Mac48Address address);
+  void SetAddr6 (Mac48Address address);
+  Mac48Address GetAddr4 () const;
+  Mac48Address GetAddr5 () const;
+  Mac48Address GetAddr6 () const;
 
-  void   SetMeshSeqno (uint32_t seqno);
-  uint32_t  GetMeshSeqno () const;
+  void SetMeshSeqno (uint32_t seqno);
+  uint32_t GetMeshSeqno () const;
 
-  void   SetMeshTtl (uint8_t TTL);
-  uint8_t  GetMeshTtl () const;
+  void SetMeshTtl (uint8_t TTL);
+  uint8_t GetMeshTtl () const;
 
-  void   SetAddressExt (uint8_t num_of_addresses);
-  uint8_t  GetAddressExt () const;
+  void SetAddressExt (uint8_t num_of_addresses);
+  uint8_t GetAddressExt () const;
 
   virtual uint32_t GetSerializedSize () const;
-  virtual void  Serialize (Buffer::Iterator start) const;
+  virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 private:
-  uint8_t  m_meshFlags;
-  uint8_t  m_meshTtl;
+  uint8_t m_meshFlags;
+  uint8_t m_meshTtl;
   uint32_t m_meshSeqno;
   Mac48Address m_addr4;
   Mac48Address m_addr5;
@@ -75,37 +75,37 @@
 
 /**
  * \ingroup dot11s
- * 
+ *
  * \brief See IEEE 802.11s draft 3.0 section 7.2.3.14
- * 
- * Header format: | category: 1 | action value: 1 | 
+ *
+ * Header format: | category: 1 | action value: 1 |
  */
-class WifiMeshActionHeader : public Header 
+class WifiMeshActionHeader : public Header
 {
 public:
   WifiMeshActionHeader ();
   ~WifiMeshActionHeader ();
-      
+
   /* Compatible with open80211s implementation */
   enum CategoryValue //table 7-24 staring from 4
   {
-    MESH_PEERING_MGT            = 30,
-    MESH_LINK_METRIC            = 31,
-    MESH_PATH_SELECTION         = 32,
-    MESH_INTERWORKING           = 33,
-    MESH_RESOURCE_COORDINATION  = 34,
-    MESH_PROXY_FORWARDING       = 35,
+    MESH_PEERING_MGT = 30,
+    MESH_LINK_METRIC = 31,
+    MESH_PATH_SELECTION = 32,
+    MESH_INTERWORKING = 33,
+    MESH_RESOURCE_COORDINATION = 34,
+    MESH_PROXY_FORWARDING = 35,
   };
   /* Compatible with open80211s implementation */
   enum PeerLinkMgtActionValue
   {
-    PEER_LINK_OPEN              = 0,
-    PEER_LINK_CONFIRM           = 1,
-    PEER_LINK_CLOSE             = 2,
+    PEER_LINK_OPEN = 0,
+    PEER_LINK_CONFIRM = 1,
+    PEER_LINK_CLOSE = 2,
   };
   enum LinkMetricActionValue
   {
-    LINK_METRIC_REQUEST         = 0,
+    LINK_METRIC_REQUEST = 0,
     LINK_METRIC_REPORT,
   };
   /* Compatible with open80211s implementation */
@@ -115,7 +115,7 @@
   };
   enum InterworkActionValue
   {
-    PORTAL_ANNOUNCEMENT         = 0,
+    PORTAL_ANNOUNCEMENT = 0,
   };
   enum ResourceCoordinationActionValue
   {
@@ -132,21 +132,21 @@
   };
   typedef union
   {
-    enum PeerLinkMgtActionValue  peerLink;
-    enum LinkMetricActionValue  linkMetrtic;
-    enum PathSelectionActionValue  pathSelection;
-    enum InterworkActionValue  interwork;
+    enum PeerLinkMgtActionValue peerLink;
+    enum LinkMetricActionValue linkMetrtic;
+    enum PathSelectionActionValue pathSelection;
+    enum InterworkActionValue interwork;
     enum ResourceCoordinationActionValue resourceCoordination;
   } ActionValue;
   void   SetAction (enum CategoryValue type,ActionValue action);
-  
+
   CategoryValue GetCategory ();
-  ActionValue  GetAction ();
-  static TypeId  GetTypeId ();
-  virtual TypeId  GetInstanceTypeId () const;
-  virtual void  Print (std::ostream &os) const;
+  ActionValue GetAction ();
+  static TypeId GetTypeId ();
+  virtual TypeId GetInstanceTypeId () const;
+  virtual void Print (std::ostream &os) const;
   virtual uint32_t GetSerializedSize () const;
-  virtual void  Serialize (Buffer::Iterator start) const;
+  virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 private:
   uint8_t m_category;