X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fmesh_plink.c;h=37f0c2b94ae7a7524b28dff277fc8fc2c98b5b5b;hb=3b5c6b834984b09b7b7fba6a97d3a2878a4a8e42;hp=56c54e321b387a9ffd1c8423a9048246c210caf7;hpb=93e5deb1ae39b56f4743955e76c72251256f23c1;p=linux-2.6

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 56c54e321b..37f0c2b94a 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -9,7 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/random.h>
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "mesh.h"
 
 #ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
@@ -18,7 +18,6 @@
 #define mpl_dbg(fmt, args...)	do { (void)(0); } while (0)
 #endif
 
-#define IEEE80211_FC(type, stype) cpu_to_le16(type | stype)
 #define PLINK_GET_FRAME_SUBTYPE(p) (p)
 #define PLINK_GET_LLID(p) (p + 1)
 #define PLINK_GET_PLID(p) (p + 3)