Author: rpaulo
Date: Sat Aug 8 21:08:35 2015
New Revision: 286475
URL: https://svnweb.freebsd.org/changeset/base/286475
Log:
iwm: use the proper include path for iwm headers.
Modified:
head/sys/dev/iwm/if_iwm.c
head/sys/dev/iwm/if_iwm_binding.c
head/sys/dev/iwm/if_iwm_mac_ctxt.c
head/sys/dev/iwm/if_iwm_pcie_trans.c
head/sys/dev/iwm/if_iwm_phy_ctxt.c
head/sys/dev/iwm/if_iwm_phy_db.c
head/sys/dev/iwm/if_iwm_power.c
head/sys/dev/iwm/if_iwm_scan.c
head/sys/dev/iwm/if_iwm_time_event.c
head/sys/dev/iwm/if_iwm_util.c
Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c Sat Aug 8 21:08:10 2015 (r286474)
+++ head/sys/dev/iwm/if_iwm.c Sat Aug 8 21:08:35 2015 (r286475)
@@ -148,19 +148,19 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-#include <if_iwm_binding.h>
-#include <if_iwm_phy_db.h>
-#include <if_iwm_mac_ctxt.h>
-#include <if_iwm_phy_ctxt.h>
-#include <if_iwm_time_event.h>
-#include <if_iwm_power.h>
-#include <if_iwm_scan.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_binding.h>
+#include <dev/iwm/if_iwm_phy_db.h>
+#include <dev/iwm/if_iwm_mac_ctxt.h>
+#include <dev/iwm/if_iwm_phy_ctxt.h>
+#include <dev/iwm/if_iwm_time_event.h>
+#include <dev/iwm/if_iwm_power.h>
+#include <dev/iwm/if_iwm_scan.h>
-#include <if_iwm_pcie_trans.h>
+#include <dev/iwm/if_iwm_pcie_trans.h>
const uint8_t iwm_nvm_channels[] = {
/* 2.4 GHz */
Modified: head/sys/dev/iwm/if_iwm_binding.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_binding.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_binding.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,11 +148,11 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-#include <if_iwm_binding.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_binding.h>
/*
* BEGIN iwlwifi/mvm/binding.c
Modified: head/sys/dev/iwm/if_iwm_mac_ctxt.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_mac_ctxt.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_mac_ctxt.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,11 +148,11 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-#include <if_iwm_mac_ctxt.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_mac_ctxt.h>
/*
* BEGIN mvm/mac-ctxt.c
Modified: head/sys/dev/iwm/if_iwm_pcie_trans.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_pcie_trans.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_pcie_trans.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,11 +148,10 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-
-#include <if_iwm_pcie_trans.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_pcie_trans.h>
/*
* This is a subset of what's in linux iwlwifi/pcie/trans.c.
Modified: head/sys/dev/iwm/if_iwm_phy_ctxt.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_phy_ctxt.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_phy_ctxt.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,18 +148,11 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-
-#if 0
-#include <if_iwm_binding.h>
-#include <if_iwm_phy_db.h>
-#include <if_iwm_mac_ctxt.h>
-#include <if_iwm_pcie_trans.h>
-#endif
-#include <if_iwm_phy_ctxt.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_phy_ctxt.h>
/*
* BEGIN iwlwifi/mvm/phy-ctxt.c
Modified: head/sys/dev/iwm/if_iwm_phy_db.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_phy_db.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_phy_db.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,11 +148,11 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-#include <if_iwm_phy_db.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_phy_db.h>
/*
* BEGIN iwl-phy-db.c
Modified: head/sys/dev/iwm/if_iwm_power.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_power.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_power.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -132,11 +132,11 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-#include <if_iwm_power.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_power.h>
/*
* BEGIN mvm/power.c
Modified: head/sys/dev/iwm/if_iwm_scan.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_scan.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_scan.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,21 +148,11 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-#if 0
-#include <if_iwm_binding.h>
-#include <if_iwm_phy_db.h>
-#include <if_iwm_mac_ctxt.h>
-#include <if_iwm_phy_ctxt.h>
-#include <if_iwm_time_event.h>
-#include <if_iwm_power.h>
-#include <if_iwm_pcie_trans.h>
-#endif
-
-#include <if_iwm_scan.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_scan.h>
/*
* BEGIN mvm/scan.c
Modified: head/sys/dev/iwm/if_iwm_time_event.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_time_event.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_time_event.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,12 +148,12 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_util.h>
-#include <if_iwm_pcie_trans.h>
-#include <if_iwm_time_event.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_pcie_trans.h>
+#include <dev/iwm/if_iwm_time_event.h>
/*
* For the high priority TE use a time event type that has similar priority to
Modified: head/sys/dev/iwm/if_iwm_util.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_util.c Sat Aug 8 21:08:10 2015
(r286474)
+++ head/sys/dev/iwm/if_iwm_util.c Sat Aug 8 21:08:35 2015
(r286475)
@@ -148,12 +148,12 @@ __FBSDID("$FreeBSD$");
#include <net80211/ieee80211_ratectl.h>
#include <net80211/ieee80211_radiotap.h>
-#include <if_iwmreg.h>
-#include <if_iwmvar.h>
-#include <if_iwm_debug.h>
-#include <if_iwm_binding.h>
-#include <if_iwm_util.h>
-#include <if_iwm_pcie_trans.h>
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_binding.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_pcie_trans.h>
static void
iwm_dma_map_mem(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
