Restructured filenames in information elements

src/devices/mesh/802.11s/ie-dot11s-beacon-timing.cc

@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 namespace ns3 {
 /*******************************************
  * WifiBeaconTimingElementUnit

src/devices/mesh/802.11s/ie-dot11s-configuration.cc

@@ -20,7 +20,7 @@
  */
 
 
-#include "ns3/mesh-configuration-element.h"
+#include "ns3/ie-dot11s-configuration.h"
 #include "ns3/assert.h"
 
 //NS_LOG_COMPONENT_DEFINE ("MeshConfigurationElement");

src/devices/mesh/802.11s/ie-dot11s-perr.cc

@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-perr-information-element.h"
+#include "ns3/ie-dot11s-perr.h"
 #include "ns3/address-utils.h"
 
 namespace ns3 {

src/devices/mesh/802.11s/ie-dot11s-prep.cc

@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-prep-information-element.h"
+#include "ns3/ie-dot11s-prep.h"
 #include "ns3/address-utils.h"
 #include "ns3/assert.h"
 namespace ns3 {

src/devices/mesh/802.11s/ie-dot11s-preq.cc

@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-preq-information-element.h"
+#include "ns3/ie-dot11s-preq.h"
 #include "ns3/address-utils.h"
 #include "ns3/assert.h"
 

src/devices/mesh/802.11s/ie-dot11s-rann.cc

@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-rann-information-element.h"
+#include "ns3/ie-dot11s-rann.h"
 #include "ns3/assert.h"
 #include "ns3/address-utils.h"
 

src/devices/mesh/802.11s/wscript

@@ -4,23 +4,23 @@ def build(bld):
     obj = bld.create_ns3_module('802.11s', ['wifi'])
     obj.source = [
         'wifi-information-element.cc',
-        'mesh-wifi-beacon-timing-element.cc',
-        'mesh-configuration-element.cc',
-        'mesh-wifi-preq-information-element.cc',
-        'mesh-wifi-prep-information-element.cc',
-        'mesh-wifi-perr-information-element.cc',
-        'mesh-wifi-rann-information-element.cc',
+        'ie-dot11s-beacon-timing.cc',
+        'ie-dot11s-configuration.cc',
+        'ie-dot11s-preq.cc',
+        'ie-dot11s-prep.cc',
+        'ie-dot11s-perr.cc',
+        'ie-dot11s-rann.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = '802.11s'
     headers.source = [
         'wifi-information-element.h',
-        'mesh-wifi-beacon-timing-element.h',
-        'mesh-configuration-element.h',
-        'mesh-wifi-preq-information-element.h',
-        'mesh-wifi-prep-information-element.h',
-        'mesh-wifi-perr-information-element.h',
-        'mesh-wifi-rann-information-element.h',
+        'ie-dot11s-beacon-timing.h',
+        'ie-dot11s-configuration.h',
+        'ie-dot11s-preq.h',
+        'ie-dot11s-prep.h',
+        'ie-dot11s-perr.h',
+        'ie-dot11s-rann.h',
         ]
 
 #    obj = bld.create_ns3_program('wifi-phy-test',

src/devices/mesh/hwmp-state.h

@@ -28,9 +28,9 @@
 #include "ns3/packet.h"
 #include "ns3/wifi-net-device.h"
 #include "ns3/mesh-wifi-mac.h"
-#include "ns3/mesh-wifi-preq-information-element.h"
-#include "ns3/mesh-wifi-prep-information-element.h"
-#include "ns3/mesh-wifi-perr-information-element.h"
+#include "ns3/ie-dot11s-preq.h"
+#include "ns3/ie-dot11s-prep.h"
+#include "ns3/ie-dot11s-perr.h"
 #include "ns3/dot11s-parameters.h"
 namespace ns3 {
 /**

src/devices/mesh/mesh-mgt-headers.h

@@ -29,13 +29,12 @@
 #include "ns3/status-code.h"
 #include "ns3/dot11s-peer-management-element.h"
 #include "ns3/supported-rates.h"
-#include "ns3/mesh-configuration-element.h"
-#include "ns3/mesh-wifi-preq-information-element.h"
-#include "ns3/mesh-wifi-prep-information-element.h"
-#include "ns3/mesh-wifi-perr-information-element.h"
-#include "ns3/mesh-wifi-rann-information-element.h"
-#include "ns3/mesh-configuration-element.h"
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-preq.h"
+#include "ns3/ie-dot11s-prep.h"
+#include "ns3/ie-dot11s-perr.h"
+#include "ns3/ie-dot11s-rann.h"
+#include "ns3/ie-dot11s-configuration.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 #include "ns3/mgt-headers.h"
 #include "ns3/ssid.h"
 

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

@@ -31,7 +31,7 @@
 #include "ns3/callback.h"
 #include "ns3/packet.h"
 #include "ns3/nstime.h"
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 #include "ns3/wifi-remote-station-manager.h"
 #include "ns3/mesh-wifi-peer-manager.h"
 #include "ns3/wifi-mac.h"

src/devices/mesh/mesh-wifi-peer-manager.h

@@ -30,7 +30,7 @@
 #include "ns3/uinteger.h"
 #include "ns3/wifi-net-device.h"
 #include "ns3/dot11s-peer-management-element.h"
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 #include "ns3/mesh-wifi-mac.h"
 
 #include <list>