diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
| commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
| tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /freebsd/sys/net80211 | |
| parent | Move files to match FreeBSD layout (diff) | |
| download | rtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2 | |
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files
are mapped by the translation script:
o rtems/bsd/sys/_types.h
o rtems/bsd/sys/errno.h
o rtems/bsd/sys/lock.h
o rtems/bsd/sys/param.h
o rtems/bsd/sys/resource.h
o rtems/bsd/sys/time.h
o rtems/bsd/sys/timespec.h
o rtems/bsd/sys/types.h
o rtems/bsd/sys/unistd.h
It is now possible to include <sys/socket.h> directly for example.
Generate one Makefile which builds everything including tests.
Diffstat (limited to 'freebsd/sys/net80211')
66 files changed, 838 insertions, 838 deletions
diff --git a/freebsd/sys/net80211/_ieee80211.h b/freebsd/sys/net80211/_ieee80211.h index 764e5cf1..c488c006 100644 --- a/freebsd/sys/net80211/_ieee80211.h +++ b/freebsd/sys/net80211/_ieee80211.h @@ -25,8 +25,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211__IEEE80211_HH_ -#define _NET80211__IEEE80211_HH_ +#ifndef _NET80211__IEEE80211_H_ +#define _NET80211__IEEE80211_H_ /* * 802.11 implementation definitions. @@ -393,4 +393,4 @@ struct ieee80211_mimo_info { uint8_t pad[2]; uint32_t evm[3]; /* EVM data */ }; -#endif /* _NET80211__IEEE80211_HH_ */ +#endif /* _NET80211__IEEE80211_H_ */ diff --git a/freebsd/sys/net80211/ieee80211.c b/freebsd/sys/net80211/ieee80211.c index 8770d452..831998b6 100644 --- a/freebsd/sys/net80211/ieee80211.c +++ b/freebsd/sys/net80211/ieee80211.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Atsushi Onoe @@ -26,34 +26,34 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 generic handler */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_dl.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#include <net/if_types.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_regdomain.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_regdomain.h> #ifdef IEEE80211_SUPPORT_SUPERG -#include <freebsd/net80211/ieee80211_superg.h> +#include <net80211/ieee80211_superg.h> #endif -#include <freebsd/net80211/ieee80211_ratectl.h> +#include <net80211/ieee80211_ratectl.h> -#include <freebsd/net/bpf.h> +#include <net/bpf.h> const char *ieee80211_phymode_name[IEEE80211_MODE_MAX] = { [IEEE80211_MODE_AUTO] = "auto", diff --git a/freebsd/sys/net80211/ieee80211.h b/freebsd/sys/net80211/ieee80211.h index 6019e0ed..712c2a8d 100644 --- a/freebsd/sys/net80211/ieee80211.h +++ b/freebsd/sys/net80211/ieee80211.h @@ -25,8 +25,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_HH_ -#define _NET80211_IEEE80211_HH_ +#ifndef _NET80211_IEEE80211_H_ +#define _NET80211_IEEE80211_H_ /* * 802.11 protocol definitions. @@ -1084,4 +1084,4 @@ struct ieee80211_duration { IEEE80211_DUR_DS_SLOW_PLCPHDR + \ IEEE80211_DUR_DIFS) -#endif /* _NET80211_IEEE80211_HH_ */ +#endif /* _NET80211_IEEE80211_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_acl.c b/freebsd/sys/net80211/ieee80211_acl.c index 955989a6..2bad7bf4 100644 --- a/freebsd/sys/net80211/ieee80211_acl.c +++ b/freebsd/sys/net80211/ieee80211_acl.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2004-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -39,23 +39,23 @@ __FBSDID("$FreeBSD$"); * and if found the frame is either accepted (ACL_POLICY_ALLOW) * or rejected (ACL_POLICY_DENT). */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/queue.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/queue.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/route.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> +#include <net/route.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> enum { ACL_POLICY_OPEN = 0, /* open, don't check ACL's */ diff --git a/freebsd/sys/net80211/ieee80211_action.c b/freebsd/sys/net80211/ieee80211_action.c index 4bd5c700..0804b46c 100644 --- a/freebsd/sys/net80211/ieee80211_action.c +++ b/freebsd/sys/net80211/ieee80211_action.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2009 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -34,22 +34,22 @@ __FBSDID("$FreeBSD$"); * IEEE 802.11 send/recv action frame support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_action.h> -#include <freebsd/net80211/ieee80211_mesh.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_action.h> +#include <net80211/ieee80211_mesh.h> static int send_inval(struct ieee80211_node *ni, int cat, int act, void *sa) diff --git a/freebsd/sys/net80211/ieee80211_action.h b/freebsd/sys/net80211/ieee80211_action.h index 943d145b..4ee2aff4 100644 --- a/freebsd/sys/net80211/ieee80211_action.h +++ b/freebsd/sys/net80211/ieee80211_action.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_ACTION_HH_ -#define _NET80211_IEEE80211_ACTION_HH_ +#ifndef _NET80211_IEEE80211_ACTION_H_ +#define _NET80211_IEEE80211_ACTION_H_ /* * 802.11 send/recv action frame support. @@ -49,4 +49,4 @@ void ieee80211_recv_action_unregister(int cat, int act); int ieee80211_recv_action(struct ieee80211_node *, const struct ieee80211_frame *, const uint8_t *, const uint8_t *); -#endif /* _NET80211_IEEE80211_ACTION_HH_ */ +#endif /* _NET80211_IEEE80211_ACTION_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_adhoc.c b/freebsd/sys/net80211/ieee80211_adhoc.c index 44d91041..3030bcd0 100644 --- a/freebsd/sys/net80211/ieee80211_adhoc.c +++ b/freebsd/sys/net80211/ieee80211_adhoc.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -33,37 +33,37 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 IBSS mode support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net/bpf.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_adhoc.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net/bpf.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_adhoc.h> +#include <net80211/ieee80211_input.h> #ifdef IEEE80211_SUPPORT_SUPERG -#include <freebsd/net80211/ieee80211_superg.h> +#include <net80211/ieee80211_superg.h> #endif #ifdef IEEE80211_SUPPORT_TDMA -#include <freebsd/net80211/ieee80211_tdma.h> +#include <net80211/ieee80211_tdma.h> #endif #define IEEE80211_RATE2MBS(r) (((r) & IEEE80211_RATE_VAL) / 2) diff --git a/freebsd/sys/net80211/ieee80211_adhoc.h b/freebsd/sys/net80211/ieee80211_adhoc.h index 2fad984e..d8e19e5e 100644 --- a/freebsd/sys/net80211/ieee80211_adhoc.h +++ b/freebsd/sys/net80211/ieee80211_adhoc.h @@ -24,12 +24,12 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_ADHOC_HH_ -#define _NET80211_IEEE80211_ADHOC_HH_ +#ifndef _NET80211_IEEE80211_ADHOC_H_ +#define _NET80211_IEEE80211_ADHOC_H_ /* * Adhoc-mode (ibss+ahdemo) implementation definitions. */ void ieee80211_adhoc_attach(struct ieee80211com *); void ieee80211_adhoc_detach(struct ieee80211com *); -#endif /* !_NET80211_IEEE80211_STA_HH_ */ +#endif /* !_NET80211_IEEE80211_STA_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_ageq.c b/freebsd/sys/net80211/ieee80211_ageq.c index 2e838e35..3d164977 100644 --- a/freebsd/sys/net80211/ieee80211_ageq.c +++ b/freebsd/sys/net80211/ieee80211_ageq.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2009 Sam Leffler, Errno Consulting @@ -25,25 +25,25 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 age queue support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> /* * Initialize an ageq. diff --git a/freebsd/sys/net80211/ieee80211_ageq.h b/freebsd/sys/net80211/ieee80211_ageq.h index 8aecae05..fdcf071a 100644 --- a/freebsd/sys/net80211/ieee80211_ageq.h +++ b/freebsd/sys/net80211/ieee80211_ageq.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_STAGEQ_HH_ -#define _NET80211_IEEE80211_STAGEQ_HH_ +#ifndef _NET80211_IEEE80211_STAGEQ_H_ +#define _NET80211_IEEE80211_STAGEQ_H_ struct ieee80211_node; struct mbuf; @@ -51,4 +51,4 @@ void ieee80211_ageq_drain_node(struct ieee80211_ageq *, struct mbuf *ieee80211_ageq_age(struct ieee80211_ageq *, int quanta); struct mbuf *ieee80211_ageq_remove(struct ieee80211_ageq *, struct ieee80211_node *match); -#endif /* _NET80211_IEEE80211_STAGEQ_HH_ */ +#endif /* _NET80211_IEEE80211_STAGEQ_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_amrr.c b/freebsd/sys/net80211/ieee80211_amrr.c index 33f6c5f3..9043ec61 100644 --- a/freebsd/sys/net80211/ieee80211_amrr.c +++ b/freebsd/sys/net80211/ieee80211_amrr.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $OpenBSD: ieee80211_amrr.c,v 1.1 2006/06/17 19:07:19 damien Exp $ */ @@ -20,7 +20,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /*- @@ -31,25 +31,25 @@ __FBSDID("$FreeBSD$"); * INRIA Sophia - Projet Planete * http://www-sop.inria.fr/rapports/sophia/RR-5208.html */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sysctl.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/socket.h> +#include <sys/sysctl.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/if_media.h> #ifdef INET -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> #endif -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_amrr.h> -#include <freebsd/net80211/ieee80211_ratectl.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_amrr.h> +#include <net80211/ieee80211_ratectl.h> #define is_success(amn) \ ((amn)->amn_retrycnt < (amn)->amn_txcnt / 10) diff --git a/freebsd/sys/net80211/ieee80211_amrr.h b/freebsd/sys/net80211/ieee80211_amrr.h index b425e268..ec67bdfb 100644 --- a/freebsd/sys/net80211/ieee80211_amrr.h +++ b/freebsd/sys/net80211/ieee80211_amrr.h @@ -17,8 +17,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _NET80211_IEEE80211_AMRR_HH_ -#define _NET80211_IEEE80211_AMRR_HH_ +#ifndef _NET80211_IEEE80211_AMRR_H_ +#define _NET80211_IEEE80211_AMRR_H_ /*- * Naive implementation of the Adaptive Multi Rate Retry algorithm: @@ -58,4 +58,4 @@ struct ieee80211_amrr_node { u_int amn_retrycnt; }; -#endif /* _NET80211_IEEE80211_AMRR_HH_ */ +#endif /* _NET80211_IEEE80211_AMRR_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_crypto.c b/freebsd/sys/net80211/ieee80211_crypto.c index c3a263c8..a3b3375e 100644 --- a/freebsd/sys/net80211/ieee80211_crypto.c +++ b/freebsd/sys/net80211/ieee80211_crypto.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Atsushi Onoe @@ -26,26 +26,26 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 generic crypto support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> /* XXX ETHER_HDR_LEN */ +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> /* XXX ETHER_HDR_LEN */ -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> MALLOC_DEFINE(M_80211_CRYPTO, "80211crypto", "802.11 crypto state"); diff --git a/freebsd/sys/net80211/ieee80211_crypto.h b/freebsd/sys/net80211/ieee80211_crypto.h index b9e8e25b..57d05ad7 100644 --- a/freebsd/sys/net80211/ieee80211_crypto.h +++ b/freebsd/sys/net80211/ieee80211_crypto.h @@ -25,8 +25,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_CRYPTO_HH_ -#define _NET80211_IEEE80211_CRYPTO_HH_ +#ifndef _NET80211_IEEE80211_CRYPTO_H_ +#define _NET80211_IEEE80211_CRYPTO_H_ /* * 802.11 protocol crypto-related definitions. @@ -242,4 +242,4 @@ void ieee80211_notify_replay_failure(struct ieee80211vap *, void ieee80211_notify_michael_failure(struct ieee80211vap *, const struct ieee80211_frame *, u_int keyix); #endif /* defined(__KERNEL__) || defined(_KERNEL) */ -#endif /* _NET80211_IEEE80211_CRYPTO_HH_ */ +#endif /* _NET80211_IEEE80211_CRYPTO_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_crypto_ccmp.c b/freebsd/sys/net80211/ieee80211_crypto_ccmp.c index 82443508..a4f327bc 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_ccmp.c +++ b/freebsd/sys/net80211/ieee80211_crypto_ccmp.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -35,24 +35,24 @@ __FBSDID("$FreeBSD$"); * AP driver. The code is used with the consent of the author and * it's license is included below. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> +#include <sys/module.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> -#include <freebsd/crypto/rijndael/rijndael.h> +#include <crypto/rijndael/rijndael.h> #define AES_BLOCK_LEN 16 diff --git a/freebsd/sys/net80211/ieee80211_crypto_none.c b/freebsd/sys/net80211/ieee80211_crypto_none.c index f9112a9f..88dd7d72 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_none.c +++ b/freebsd/sys/net80211/ieee80211_crypto_none.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting @@ -25,27 +25,27 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 NULL crypto support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/module.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> static void *none_attach(struct ieee80211vap *, struct ieee80211_key *); static void none_detach(struct ieee80211_key *); diff --git a/freebsd/sys/net80211/ieee80211_crypto_tkip.c b/freebsd/sys/net80211/ieee80211_crypto_tkip.c index 6b0656e2..01d2002e 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_tkip.c +++ b/freebsd/sys/net80211/ieee80211_crypto_tkip.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -35,23 +35,23 @@ __FBSDID("$FreeBSD$"); * AP driver. The code is used with the consent of the author and * it's license is included below. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/endian.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/endian.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> static void *tkip_attach(struct ieee80211vap *, struct ieee80211_key *); static void tkip_detach(struct ieee80211_key *); diff --git a/freebsd/sys/net80211/ieee80211_crypto_wep.c b/freebsd/sys/net80211/ieee80211_crypto_wep.c index 01b3c37d..577237e7 100644 --- a/freebsd/sys/net80211/ieee80211_crypto_wep.c +++ b/freebsd/sys/net80211/ieee80211_crypto_wep.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting @@ -25,29 +25,29 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 WEP crypto support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/endian.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/endian.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> static void *wep_attach(struct ieee80211vap *, struct ieee80211_key *); static void wep_detach(struct ieee80211_key *); diff --git a/freebsd/sys/net80211/ieee80211_ddb.c b/freebsd/sys/net80211/ieee80211_ddb.c index f3b30431..73778c29 100644 --- a/freebsd/sys/net80211/ieee80211_ddb.c +++ b/freebsd/sys/net80211/ieee80211_ddb.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting @@ -25,38 +25,38 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_ddb.h> -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_ddb.h> +#include <rtems/bsd/local/opt_wlan.h> #ifdef DDB /* * IEEE 802.11 DDB support */ -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/socket.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_dl.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/net80211/ieee80211_var.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/socket.h> + +#include <net/if.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#include <net/if_types.h> +#include <net/ethernet.h> +#include <net/vnet.h> + +#include <net80211/ieee80211_var.h> #ifdef IEEE80211_SUPPORT_TDMA -#include <freebsd/net80211/ieee80211_tdma.h> +#include <net80211/ieee80211_tdma.h> #endif #ifdef IEEE80211_SUPPORT_MESH -#include <freebsd/net80211/ieee80211_mesh.h> +#include <net80211/ieee80211_mesh.h> #endif -#include <freebsd/ddb/ddb.h> -#include <freebsd/ddb/db_sym.h> +#include <ddb/ddb.h> +#include <ddb/db_sym.h> #define DB_PRINTSYM(prefix, name, addr) do { \ db_printf("%s%-25s : ", prefix, name); \ diff --git a/freebsd/sys/net80211/ieee80211_dfs.c b/freebsd/sys/net80211/ieee80211_dfs.c index 803ed337..3090a78c 100644 --- a/freebsd/sys/net80211/ieee80211_dfs.c +++ b/freebsd/sys/net80211/ieee80211_dfs.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -33,26 +33,26 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 DFS/Radar support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> - -#include <freebsd/net80211/ieee80211_var.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> + +#include <net80211/ieee80211_var.h> MALLOC_DEFINE(M_80211_DFS, "80211dfs", "802.11 DFS state"); diff --git a/freebsd/sys/net80211/ieee80211_dfs.h b/freebsd/sys/net80211/ieee80211_dfs.h index 474b2078..90760777 100644 --- a/freebsd/sys/net80211/ieee80211_dfs.h +++ b/freebsd/sys/net80211/ieee80211_dfs.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_DFS_HH_ -#define _NET80211_IEEE80211_DFS_HH_ +#ifndef _NET80211_IEEE80211_DFS_H_ +#define _NET80211_IEEE80211_DFS_H_ /* * 802.11h/DFS definitions. @@ -54,4 +54,4 @@ void ieee80211_dfs_cac_clear(struct ieee80211com *, void ieee80211_dfs_notify_radar(struct ieee80211com *, struct ieee80211_channel *); struct ieee80211_channel *ieee80211_dfs_pickchannel(struct ieee80211com *); -#endif /* _NET80211_IEEE80211_DFS_HH_ */ +#endif /* _NET80211_IEEE80211_DFS_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_freebsd.c b/freebsd/sys/net80211/ieee80211_freebsd.c index 4188f112..23623ece 100644 --- a/freebsd/sys/net80211/ieee80211_freebsd.c +++ b/freebsd/sys/net80211/ieee80211_freebsd.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2003-2009 Sam Leffler, Errno Consulting @@ -25,37 +25,37 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 support (FreeBSD-specific code) */ -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/linker.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/sys/socket.h> - -#include <freebsd/net/bpf.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_dl.h> -#include <freebsd/net/if_clone.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_types.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> +#include <sys/linker.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <sys/socket.h> + +#include <net/bpf.h> +#include <net/if.h> +#include <net/if_dl.h> +#include <net/if_clone.h> +#include <net/if_media.h> +#include <net/if_types.h> +#include <net/ethernet.h> +#include <net/route.h> +#include <net/vnet.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_input.h> SYSCTL_NODE(_net, OID_AUTO, wlan, CTLFLAG_RD, 0, "IEEE 80211 parameters"); @@ -481,7 +481,7 @@ ieee80211_process_callback(struct ieee80211_node *ni, } } -#include <freebsd/sys/libkern.h> +#include <sys/libkern.h> void get_random_bytes(void *p, size_t n) diff --git a/freebsd/sys/net80211/ieee80211_freebsd.h b/freebsd/sys/net80211/ieee80211_freebsd.h index 69efecd0..3cdc643e 100644 --- a/freebsd/sys/net80211/ieee80211_freebsd.h +++ b/freebsd/sys/net80211/ieee80211_freebsd.h @@ -24,16 +24,16 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_FREEBSD_HH_ -#define _NET80211_IEEE80211_FREEBSD_HH_ +#ifndef _NET80211_IEEE80211_FREEBSD_H_ +#define _NET80211_IEEE80211_FREEBSD_H_ #ifdef _KERNEL -#include <freebsd/sys/param.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/rwlock.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/taskqueue.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/rwlock.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.h> /* * Common state locking definitions. @@ -167,7 +167,7 @@ typedef struct mtx ieee80211_scan_table_lock_t; * is the last reference, otherwise 0 * ieee80211_node_refcnt reference count for printing (only) */ -#include <freebsd/machine/atomic.h> +#include <machine/atomic.h> #define ieee80211_node_initref(_ni) \ do { ((_ni)->ni_refcnt = 1); } while (0) @@ -547,4 +547,4 @@ struct ieee80211_bpf_params { uint8_t ibp_try3; /* series 4 try count */ uint8_t ibp_rate3; /* series 4 IEEE tx rate */ }; -#endif /* _NET80211_IEEE80211_FREEBSD_HH_ */ +#endif /* _NET80211_IEEE80211_FREEBSD_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_hostap.c b/freebsd/sys/net80211/ieee80211_hostap.c index 892957be..803a6f4a 100644 --- a/freebsd/sys/net80211/ieee80211_hostap.c +++ b/freebsd/sys/net80211/ieee80211_hostap.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -33,36 +33,36 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 HOSTAP mode support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net/bpf.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_hostap.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net/bpf.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_hostap.h> +#include <net80211/ieee80211_input.h> #ifdef IEEE80211_SUPPORT_SUPERG -#include <freebsd/net80211/ieee80211_superg.h> +#include <net80211/ieee80211_superg.h> #endif -#include <freebsd/net80211/ieee80211_wds.h> +#include <net80211/ieee80211_wds.h> #define IEEE80211_RATE2MBS(r) (((r) & IEEE80211_RATE_VAL) / 2) diff --git a/freebsd/sys/net80211/ieee80211_hostap.h b/freebsd/sys/net80211/ieee80211_hostap.h index fa35e220..87f858d1 100644 --- a/freebsd/sys/net80211/ieee80211_hostap.h +++ b/freebsd/sys/net80211/ieee80211_hostap.h @@ -24,12 +24,12 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_HOSTAP_HH_ -#define _NET80211_IEEE80211_HOSTAP_HH_ +#ifndef _NET80211_IEEE80211_HOSTAP_H_ +#define _NET80211_IEEE80211_HOSTAP_H_ /* * Hostap implementation definitions. */ void ieee80211_hostap_attach(struct ieee80211com *); void ieee80211_hostap_detach(struct ieee80211com *); -#endif /* !_NET80211_IEEE80211_HOSTAP_HH_ */ +#endif /* !_NET80211_IEEE80211_HOSTAP_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_ht.c b/freebsd/sys/net80211/ieee80211_ht.c index 2b55c067..8f698f98 100644 --- a/freebsd/sys/net80211/ieee80211_ht.c +++ b/freebsd/sys/net80211/ieee80211_ht.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -34,23 +34,23 @@ __FBSDID("$FreeBSD$"); * IEEE 802.11n protocol support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/endian.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> +#include <sys/endian.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_action.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_action.h> +#include <net80211/ieee80211_input.h> /* define here, used throughout file */ #define MS(_v, _f) (((_v) & _f) >> _f##_S) diff --git a/freebsd/sys/net80211/ieee80211_ht.h b/freebsd/sys/net80211/ieee80211_ht.h index 552a4264..7b0eab7a 100644 --- a/freebsd/sys/net80211/ieee80211_ht.h +++ b/freebsd/sys/net80211/ieee80211_ht.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_HT_HH_ -#define _NET80211_IEEE80211_HT_HH_ +#ifndef _NET80211_IEEE80211_HT_H_ +#define _NET80211_IEEE80211_HT_H_ /* * 802.11n protocol implementation definitions. @@ -199,4 +199,4 @@ uint8_t *ieee80211_add_htinfo_vendor(uint8_t *, struct ieee80211_node *); struct ieee80211_beacon_offsets; void ieee80211_ht_update_beacon(struct ieee80211vap *, struct ieee80211_beacon_offsets *); -#endif /* _NET80211_IEEE80211_HT_HH_ */ +#endif /* _NET80211_IEEE80211_HT_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_hwmp.c b/freebsd/sys/net80211/ieee80211_hwmp.c index f0a2cde9..ecf2879a 100644 --- a/freebsd/sys/net80211/ieee80211_hwmp.c +++ b/freebsd/sys/net80211/ieee80211_hwmp.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2009 The FreeBSD Foundation @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -38,33 +38,33 @@ __FBSDID("$FreeBSD$"); * * Based on March 2009, D3.0 802.11s draft spec. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net/bpf.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_action.h> -#include <freebsd/net80211/ieee80211_input.h> -#include <freebsd/net80211/ieee80211_mesh.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net/bpf.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_action.h> +#include <net80211/ieee80211_input.h> +#include <net80211/ieee80211_mesh.h> static void hwmp_vattach(struct ieee80211vap *); static void hwmp_vdetach(struct ieee80211vap *); diff --git a/freebsd/sys/net80211/ieee80211_input.c b/freebsd/sys/net80211/ieee80211_input.c index 60803d2f..a5ee1094 100644 --- a/freebsd/sys/net80211/ieee80211_input.c +++ b/freebsd/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Atsushi Onoe @@ -26,37 +26,37 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/kernel.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/endian.h> +#include <sys/kernel.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_llc.h> +#include <net/if_media.h> +#include <net/if_vlan_var.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_input.h> #ifdef IEEE80211_SUPPORT_MESH -#include <freebsd/net80211/ieee80211_mesh.h> +#include <net80211/ieee80211_mesh.h> #endif -#include <freebsd/net/bpf.h> +#include <net/bpf.h> #ifdef INET -#include <freebsd/netinet/in.h> -#include <freebsd/net/ethernet.h> +#include <netinet/in.h> +#include <net/ethernet.h> #endif int @@ -748,7 +748,7 @@ ieee80211_getbssid(const struct ieee80211vap *vap, return wh->i_addr3; } -#include <freebsd/machine/stdarg.h> +#include <machine/stdarg.h> void ieee80211_note(const struct ieee80211vap *vap, const char *fmt, ...) diff --git a/freebsd/sys/net80211/ieee80211_input.h b/freebsd/sys/net80211/ieee80211_input.h index 778badb6..5b38dddc 100644 --- a/freebsd/sys/net80211/ieee80211_input.h +++ b/freebsd/sys/net80211/ieee80211_input.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_INPUT_HH_ -#define _NET80211_IEEE80211_INPUT_HH_ +#ifndef _NET80211_IEEE80211_INPUT_H_ +#define _NET80211_IEEE80211_INPUT_H_ /* Verify the existence and length of __elem or get out. */ #define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen, _action) do { \ @@ -157,4 +157,4 @@ int ieee80211_alloc_challenge(struct ieee80211_node *); int ieee80211_parse_beacon(struct ieee80211_node *, struct mbuf *, struct ieee80211_scanparams *); int ieee80211_parse_action(struct ieee80211_node *, struct mbuf *); -#endif /* _NET80211_IEEE80211_INPUT_HH_ */ +#endif /* _NET80211_IEEE80211_INPUT_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_ioctl.c b/freebsd/sys/net80211/ieee80211_ioctl.c index 87d1acc5..995c82f2 100644 --- a/freebsd/sys/net80211/ieee80211_ioctl.c +++ b/freebsd/sys/net80211/ieee80211_ioctl.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Atsushi Onoe @@ -26,44 +26,44 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_ipx.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/endian.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/priv.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/systm.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_ipx.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <sys/endian.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/priv.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/systm.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_dl.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#include <net/ethernet.h> #ifdef INET -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> #endif #ifdef IPX -#include <freebsd/netipx/ipx.h> -#include <freebsd/netipx/ipx_if.h> +#include <netipx/ipx.h> +#include <netipx/ipx_if.h> #endif -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_ioctl.h> -#include <freebsd/net80211/ieee80211_regdomain.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_ioctl.h> +#include <net80211/ieee80211_regdomain.h> +#include <net80211/ieee80211_input.h> #define IS_UP_AUTO(_vap) \ (IFNET_IS_UP_RUNNING((_vap)->iv_ifp) && \ diff --git a/freebsd/sys/net80211/ieee80211_ioctl.h b/freebsd/sys/net80211/ieee80211_ioctl.h index 109a27fb..89d8fe53 100644 --- a/freebsd/sys/net80211/ieee80211_ioctl.h +++ b/freebsd/sys/net80211/ieee80211_ioctl.h @@ -25,15 +25,15 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_IOCTL_HH_ -#define _NET80211_IEEE80211_IOCTL_HH_ +#ifndef _NET80211_IEEE80211_IOCTL_H_ +#define _NET80211_IEEE80211_IOCTL_H_ /* * IEEE 802.11 ioctls. */ -#include <freebsd/net80211/_ieee80211.h> -#include <freebsd/net80211/ieee80211.h> -#include <freebsd/net80211/ieee80211_crypto.h> +#include <net80211/_ieee80211.h> +#include <net80211/ieee80211.h> +#include <net80211/ieee80211_crypto.h> /* * Per/node (station) statistics. @@ -846,4 +846,4 @@ struct ieee80211_clone_params { #define IEEE80211_CLONE_TDMA 0x0010 /* operate in TDMA mode */ #endif /* __FreeBSD__ */ -#endif /* _NET80211_IEEE80211_IOCTL_HH_ */ +#endif /* _NET80211_IEEE80211_IOCTL_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_mesh.c b/freebsd/sys/net80211/ieee80211_mesh.c index 06bac89a..1ed730fc 100644 --- a/freebsd/sys/net80211/ieee80211_mesh.c +++ b/freebsd/sys/net80211/ieee80211_mesh.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2009 The FreeBSD Foundation @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -38,31 +38,31 @@ __FBSDID("$FreeBSD$"); * * Based on March 2009, D3.0 802.11s draft spec. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_action.h> -#include <freebsd/net80211/ieee80211_input.h> -#include <freebsd/net80211/ieee80211_mesh.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_action.h> +#include <net80211/ieee80211_input.h> +#include <net80211/ieee80211_mesh.h> static void mesh_rt_flush_invalid(struct ieee80211vap *); static int mesh_select_proto_path(struct ieee80211vap *, const char *); diff --git a/freebsd/sys/net80211/ieee80211_mesh.h b/freebsd/sys/net80211/ieee80211_mesh.h index e90cd402..de9b5c2a 100644 --- a/freebsd/sys/net80211/ieee80211_mesh.h +++ b/freebsd/sys/net80211/ieee80211_mesh.h @@ -28,8 +28,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_MESH_HH_ -#define _NET80211_IEEE80211_MESH_HH_ +#ifndef _NET80211_IEEE80211_MESH_H_ +#define _NET80211_IEEE80211_MESH_H_ #define IEEE80211_MESH_DEFAULT_TTL 31 @@ -500,4 +500,4 @@ ieee80211_mesh_discover(struct ieee80211vap *vap, } #endif /* _KERNEL */ -#endif /* !_NET80211_IEEE80211_MESH_HH_ */ +#endif /* !_NET80211_IEEE80211_MESH_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_monitor.c b/freebsd/sys/net80211/ieee80211_monitor.c index b87c1d37..70b95a02 100644 --- a/freebsd/sys/net80211/ieee80211_monitor.c +++ b/freebsd/sys/net80211/ieee80211_monitor.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -33,31 +33,31 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 Monitor mode support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net/bpf.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_monitor.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net/bpf.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_monitor.h> static void monitor_vattach(struct ieee80211vap *); static int monitor_newstate(struct ieee80211vap *, enum ieee80211_state, int); diff --git a/freebsd/sys/net80211/ieee80211_monitor.h b/freebsd/sys/net80211/ieee80211_monitor.h index 09f95dba..d7dd8e98 100644 --- a/freebsd/sys/net80211/ieee80211_monitor.h +++ b/freebsd/sys/net80211/ieee80211_monitor.h @@ -24,12 +24,12 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_MONITOR_HH_ -#define _NET80211_IEEE80211_MONITOR_HH_ +#ifndef _NET80211_IEEE80211_MONITOR_H_ +#define _NET80211_IEEE80211_MONITOR_H_ /* * Monitor implementation definitions. */ void ieee80211_monitor_attach(struct ieee80211com *); void ieee80211_monitor_detach(struct ieee80211com *); -#endif /* !_NET80211_IEEE80211_MONITOR_HH_ */ +#endif /* !_NET80211_IEEE80211_MONITOR_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_node.c b/freebsd/sys/net80211/ieee80211_node.c index 8b8335c1..95993d88 100644 --- a/freebsd/sys/net80211/ieee80211_node.c +++ b/freebsd/sys/net80211/ieee80211_node.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Atsushi Onoe @@ -26,36 +26,36 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_input.h> #ifdef IEEE80211_SUPPORT_SUPERG -#include <freebsd/net80211/ieee80211_superg.h> +#include <net80211/ieee80211_superg.h> #endif #ifdef IEEE80211_SUPPORT_TDMA -#include <freebsd/net80211/ieee80211_tdma.h> +#include <net80211/ieee80211_tdma.h> #endif -#include <freebsd/net80211/ieee80211_wds.h> -#include <freebsd/net80211/ieee80211_mesh.h> -#include <freebsd/net80211/ieee80211_ratectl.h> +#include <net80211/ieee80211_wds.h> +#include <net80211/ieee80211_mesh.h> +#include <net80211/ieee80211_ratectl.h> -#include <freebsd/net/bpf.h> +#include <net/bpf.h> /* * IEEE80211_NODE_HASHSIZE must be a power of 2. diff --git a/freebsd/sys/net80211/ieee80211_node.h b/freebsd/sys/net80211/ieee80211_node.h index cf47a101..01bb2cf1 100644 --- a/freebsd/sys/net80211/ieee80211_node.h +++ b/freebsd/sys/net80211/ieee80211_node.h @@ -25,11 +25,11 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_NODE_HH_ -#define _NET80211_IEEE80211_NODE_HH_ +#ifndef _NET80211_IEEE80211_NODE_H_ +#define _NET80211_IEEE80211_NODE_H_ -#include <freebsd/net80211/ieee80211_ioctl.h> /* for ieee80211_nodestats */ -#include <freebsd/net80211/ieee80211_ht.h> /* for aggregation state */ +#include <net80211/ieee80211_ioctl.h> /* for ieee80211_nodestats */ +#include <net80211/ieee80211_ht.h> /* for aggregation state */ /* * Each ieee80211com instance has a single timer that fires every @@ -453,4 +453,4 @@ void ieee80211_node_join(struct ieee80211_node *,int); void ieee80211_node_leave(struct ieee80211_node *); int8_t ieee80211_getrssi(struct ieee80211vap *); void ieee80211_getsignal(struct ieee80211vap *, int8_t *, int8_t *); -#endif /* _NET80211_IEEE80211_NODE_HH_ */ +#endif /* _NET80211_IEEE80211_NODE_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_output.c b/freebsd/sys/net80211/ieee80211_output.c index b7abe9ec..24b49ab4 100644 --- a/freebsd/sys/net80211/ieee80211_output.c +++ b/freebsd/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Atsushi Onoe @@ -26,50 +26,50 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/endian.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/kernel.h> +#include <sys/endian.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/bpf.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_vlan_var.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_regdomain.h> +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_llc.h> +#include <net/if_media.h> +#include <net/if_vlan_var.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_regdomain.h> #ifdef IEEE80211_SUPPORT_SUPERG -#include <freebsd/net80211/ieee80211_superg.h> +#include <net80211/ieee80211_superg.h> #endif #ifdef IEEE80211_SUPPORT_TDMA -#include <freebsd/net80211/ieee80211_tdma.h> +#include <net80211/ieee80211_tdma.h> #endif -#include <freebsd/net80211/ieee80211_wds.h> -#include <freebsd/net80211/ieee80211_mesh.h> +#include <net80211/ieee80211_wds.h> +#include <net80211/ieee80211_mesh.h> #ifdef INET -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> #endif #ifdef INET6 -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #endif -#include <freebsd/security/mac/mac_framework.h> +#include <security/mac/mac_framework.h> #define ETHER_HEADER_COPY(dst, src) \ memcpy(dst, src, sizeof(struct ether_header)) diff --git a/freebsd/sys/net80211/ieee80211_phy.c b/freebsd/sys/net80211/ieee80211_phy.c index 5c5a2f55..9d37a967 100644 --- a/freebsd/sys/net80211/ieee80211_phy.c +++ b/freebsd/sys/net80211/ieee80211_phy.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting @@ -25,26 +25,26 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 PHY-related support. */ -#include <freebsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/if_media.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_phy.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_phy.h> #ifdef notyet struct ieee80211_ds_plcp_hdr { diff --git a/freebsd/sys/net80211/ieee80211_phy.h b/freebsd/sys/net80211/ieee80211_phy.h index af76e666..56b404f7 100644 --- a/freebsd/sys/net80211/ieee80211_phy.h +++ b/freebsd/sys/net80211/ieee80211_phy.h @@ -25,8 +25,8 @@ * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_PHY_HH_ -#define _NET80211_IEEE80211_PHY_HH_ +#ifndef _NET80211_IEEE80211_PHY_H_ +#define _NET80211_IEEE80211_PHY_H_ #ifdef _KERNEL /* @@ -152,4 +152,4 @@ uint8_t ieee80211_plcp2rate(uint8_t, enum ieee80211_phytype); */ uint8_t ieee80211_rate2plcp(int, enum ieee80211_phytype); #endif /* _KERNEL */ -#endif /* !_NET80211_IEEE80211_PHY_HH_ */ +#endif /* !_NET80211_IEEE80211_PHY_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_power.c b/freebsd/sys/net80211/ieee80211_power.c index f56a641f..c15080c4 100644 --- a/freebsd/sys/net80211/ieee80211_power.c +++ b/freebsd/sys/net80211/ieee80211_power.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting @@ -25,27 +25,27 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 power save support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> -#include <freebsd/net/bpf.h> +#include <net/bpf.h> static void ieee80211_update_ps(struct ieee80211vap *, int); static int ieee80211_set_tim(struct ieee80211_node *, int); diff --git a/freebsd/sys/net80211/ieee80211_power.h b/freebsd/sys/net80211/ieee80211_power.h index 6cb0eab8..352cdadb 100644 --- a/freebsd/sys/net80211/ieee80211_power.h +++ b/freebsd/sys/net80211/ieee80211_power.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_POWER_HH_ -#define _NET80211_IEEE80211_POWER_HH_ +#ifndef _NET80211_IEEE80211_POWER_H_ +#define _NET80211_IEEE80211_POWER_H_ struct ieee80211com; struct ieee80211vap; @@ -76,4 +76,4 @@ void ieee80211_node_pwrsave(struct ieee80211_node *, int enable); void ieee80211_sta_pwrsave(struct ieee80211vap *, int enable); void ieee80211_power_poll(struct ieee80211com *); -#endif /* _NET80211_IEEE80211_POWER_HH_ */ +#endif /* _NET80211_IEEE80211_POWER_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_proto.c b/freebsd/sys/net80211/ieee80211_proto.c index 70c5f299..d2874951 100644 --- a/freebsd/sys/net80211/ieee80211_proto.c +++ b/freebsd/sys/net80211/ieee80211_proto.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2001 Atsushi Onoe @@ -26,37 +26,37 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 protocol support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> +#include <sys/socket.h> +#include <sys/sockio.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> /* XXX for ether_sprintf */ +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> /* XXX for ether_sprintf */ -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_adhoc.h> -#include <freebsd/net80211/ieee80211_sta.h> -#include <freebsd/net80211/ieee80211_hostap.h> -#include <freebsd/net80211/ieee80211_wds.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_adhoc.h> +#include <net80211/ieee80211_sta.h> +#include <net80211/ieee80211_hostap.h> +#include <net80211/ieee80211_wds.h> #ifdef IEEE80211_SUPPORT_MESH -#include <freebsd/net80211/ieee80211_mesh.h> +#include <net80211/ieee80211_mesh.h> #endif -#include <freebsd/net80211/ieee80211_monitor.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <net80211/ieee80211_monitor.h> +#include <net80211/ieee80211_input.h> /* XXX tunables */ #define AGGRESSIVE_MODE_SWITCH_HYSTERESIS 3 /* pkts / 100ms */ diff --git a/freebsd/sys/net80211/ieee80211_proto.h b/freebsd/sys/net80211/ieee80211_proto.h index f81a6433..c2808477 100644 --- a/freebsd/sys/net80211/ieee80211_proto.h +++ b/freebsd/sys/net80211/ieee80211_proto.h @@ -25,8 +25,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_PROTO_HH_ -#define _NET80211_IEEE80211_PROTO_HH_ +#ifndef _NET80211_IEEE80211_PROTO_H_ +#define _NET80211_IEEE80211_PROTO_H_ /* * 802.11 protocol implementation definitions. @@ -384,4 +384,4 @@ void ieee80211_notify_node_auth(struct ieee80211_node *); void ieee80211_notify_country(struct ieee80211vap *, const uint8_t [], const uint8_t cc[2]); void ieee80211_notify_radio(struct ieee80211com *, int); -#endif /* _NET80211_IEEE80211_PROTO_HH_ */ +#endif /* _NET80211_IEEE80211_PROTO_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_radiotap.c b/freebsd/sys/net80211/ieee80211_radiotap.c index f630ae99..b51974b3 100644 --- a/freebsd/sys/net80211/ieee80211_radiotap.c +++ b/freebsd/sys/net80211/ieee80211_radiotap.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2009 Sam Leffler, Errno Consulting @@ -25,29 +25,29 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 radiotap support. */ -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/kernel.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/endian.h> +#include <sys/kernel.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/bpf.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/if_media.h> +#include <net/bpf.h> +#include <net/if.h> +#include <net/if_llc.h> +#include <net/if_media.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> static int radiotap_offset(struct ieee80211_radiotap_header *, int); diff --git a/freebsd/sys/net80211/ieee80211_radiotap.h b/freebsd/sys/net80211/ieee80211_radiotap.h index 89eac4be..b8a8b510 100644 --- a/freebsd/sys/net80211/ieee80211_radiotap.h +++ b/freebsd/sys/net80211/ieee80211_radiotap.h @@ -29,8 +29,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. */ -#ifndef _NET80211_IEEE80211_RADIOTAP_HH_ -#define _NET80211_IEEE80211_RADIOTAP_HH_ +#ifndef _NET80211_IEEE80211_RADIOTAP_H_ +#define _NET80211_IEEE80211_RADIOTAP_H_ /* A generic radio capture format is desirable. It must be * rigidly defined (e.g., units for fields should be given), @@ -231,4 +231,4 @@ enum ieee80211_radiotap_type { #define IEEE80211_RADIOTAP_F_BADFCS 0x40 /* does not pass FCS check */ #define IEEE80211_RADIOTAP_F_SHORTGI 0x80 /* HT short GI */ -#endif /* !_NET80211_IEEE80211_RADIOTAP_HH_ */ +#endif /* !_NET80211_IEEE80211_RADIOTAP_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_ratectl.c b/freebsd/sys/net80211/ieee80211_ratectl.c index 8eede3cb..b54188e0 100644 --- a/freebsd/sys/net80211/ieee80211_ratectl.c +++ b/freebsd/sys/net80211/ieee80211_ratectl.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2010 Rui Paulo <rpaulo@FreeBSD.org> @@ -25,19 +25,19 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/socket.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/if_media.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_ratectl.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_ratectl.h> static const struct ieee80211_ratectl *ratectls[IEEE80211_RATECTL_MAX]; diff --git a/freebsd/sys/net80211/ieee80211_ratectl_none.c b/freebsd/sys/net80211/ieee80211_ratectl_none.c index 97f0749f..62b7c99c 100644 --- a/freebsd/sys/net80211/ieee80211_ratectl_none.c +++ b/freebsd/sys/net80211/ieee80211_ratectl_none.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2010 Bernhard Schmidt <bschmidt@FreeBSD.org> @@ -25,27 +25,27 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sysctl.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/socket.h> +#include <sys/sysctl.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/if_media.h> #ifdef INET -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/if_ether.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> #endif -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_ratectl.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_ratectl.h> static void none_init(struct ieee80211vap *vap) diff --git a/freebsd/sys/net80211/ieee80211_regdomain.c b/freebsd/sys/net80211/ieee80211_regdomain.c index e83132c8..890ddf79 100644 --- a/freebsd/sys/net80211/ieee80211_regdomain.c +++ b/freebsd/sys/net80211/ieee80211_regdomain.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2005-2008 Sam Leffler, Errno Consulting @@ -25,25 +25,25 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 regdomain support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/if_media.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_regdomain.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_regdomain.h> static void null_getradiocaps(struct ieee80211com *ic, int maxchan, diff --git a/freebsd/sys/net80211/ieee80211_regdomain.h b/freebsd/sys/net80211/ieee80211_regdomain.h index f71c1093..8942dd98 100644 --- a/freebsd/sys/net80211/ieee80211_regdomain.h +++ b/freebsd/sys/net80211/ieee80211_regdomain.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_REGDOMAIN_HH_ -#define _NET80211_IEEE80211_REGDOMAIN_HH_ +#ifndef _NET80211_IEEE80211_REGDOMAIN_H_ +#define _NET80211_IEEE80211_REGDOMAIN_H_ /* * 802.11 regulatory domain definitions. @@ -279,4 +279,4 @@ struct ieee80211_regdomain_req; int ieee80211_setregdomain(struct ieee80211vap *, struct ieee80211_regdomain_req *); #endif /* defined(__KERNEL__) || defined(_KERNEL) */ -#endif /* _NET80211_IEEE80211_REGDOMAIN_HH_ */ +#endif /* _NET80211_IEEE80211_REGDOMAIN_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_rssadapt.c b/freebsd/sys/net80211/ieee80211_rssadapt.c index b50d2e66..687ea41e 100644 --- a/freebsd/sys/net80211/ieee80211_rssadapt.c +++ b/freebsd/sys/net80211/ieee80211_rssadapt.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $NetBSD: ieee80211_rssadapt.c,v 1.9 2005/02/26 22:45:09 perry Exp $ */ @@ -32,20 +32,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sysctl.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/socket.h> +#include <sys/sysctl.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> +#include <net/if.h> +#include <net/if_media.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_rssadapt.h> -#include <freebsd/net80211/ieee80211_ratectl.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_rssadapt.h> +#include <net80211/ieee80211_ratectl.h> struct rssadapt_expavgctl { /* RSS threshold decay. */ diff --git a/freebsd/sys/net80211/ieee80211_rssadapt.h b/freebsd/sys/net80211/ieee80211_rssadapt.h index 26211ece..ee1d2d90 100644 --- a/freebsd/sys/net80211/ieee80211_rssadapt.h +++ b/freebsd/sys/net80211/ieee80211_rssadapt.h @@ -29,8 +29,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. */ -#ifndef _NET80211_IEEE80211_RSSADAPT_HH_ -#define _NET80211_IEEE80211_RSSADAPT_HH_ +#ifndef _NET80211_IEEE80211_RSSADAPT_H_ +#define _NET80211_IEEE80211_RSSADAPT_H_ /* Data-rate adaptation loosely based on "Link Adaptation Strategy * for IEEE 802.11 WLAN via Received Signal Strength Measurement" @@ -68,4 +68,4 @@ struct ieee80211_rssadapt_node { #define IEEE80211_RSSADAPT_SUCCESS 1 #define IEEE80211_RSSADAPT_FAILURE 0 -#endif /* _NET80211_IEEE80211_RSSADAPT_HH_ */ +#endif /* _NET80211_IEEE80211_RSSADAPT_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_scan.c b/freebsd/sys/net80211/ieee80211_scan.c index bda486ec..4a23066d 100644 --- a/freebsd/sys/net80211/ieee80211_scan.c +++ b/freebsd/sys/net80211/ieee80211_scan.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting @@ -25,29 +25,29 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 scanning support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/condvar.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/proc.h> +#include <sys/kernel.h> +#include <sys/condvar.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> -#include <freebsd/net/bpf.h> +#include <net/bpf.h> struct scan_state { struct ieee80211_scan_state base; /* public state */ diff --git a/freebsd/sys/net80211/ieee80211_scan.h b/freebsd/sys/net80211/ieee80211_scan.h index 6273902d..4c5e869a 100644 --- a/freebsd/sys/net80211/ieee80211_scan.h +++ b/freebsd/sys/net80211/ieee80211_scan.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_SCAN_HH_ -#define _NET80211_IEEE80211_SCAN_HH_ +#ifndef _NET80211_IEEE80211_SCAN_H_ +#define _NET80211_IEEE80211_SCAN_H_ /* * 802.11 scanning support. @@ -298,4 +298,4 @@ void ieee80211_scanner_unregister(enum ieee80211_opmode, const struct ieee80211_scanner *); void ieee80211_scanner_unregister_all(const struct ieee80211_scanner *); const struct ieee80211_scanner *ieee80211_scanner_get(enum ieee80211_opmode); -#endif /* _NET80211_IEEE80211_SCAN_HH_ */ +#endif /* _NET80211_IEEE80211_SCAN_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_scan_sta.c b/freebsd/sys/net80211/ieee80211_scan_sta.c index aa9d67ec..573f994f 100644 --- a/freebsd/sys/net80211/ieee80211_scan_sta.c +++ b/freebsd/sys/net80211/ieee80211_scan_sta.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting @@ -25,36 +25,36 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* * IEEE 802.11 station scanning support. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/module.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/module.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_input.h> -#include <freebsd/net80211/ieee80211_regdomain.h> +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_input.h> +#include <net80211/ieee80211_regdomain.h> #ifdef IEEE80211_SUPPORT_TDMA -#include <freebsd/net80211/ieee80211_tdma.h> +#include <net80211/ieee80211_tdma.h> #endif #ifdef IEEE80211_SUPPORT_MESH -#include <freebsd/net80211/ieee80211_mesh.h> +#include <net80211/ieee80211_mesh.h> #endif -#include <freebsd/net/bpf.h> +#include <net/bpf.h> /* * Parameters for managing cache entries: diff --git a/freebsd/sys/net80211/ieee80211_sta.c b/freebsd/sys/net80211/ieee80211_sta.c index 67704469..d07e83c4 100644 --- a/freebsd/sys/net80211/ieee80211_sta.c +++ b/freebsd/sys/net80211/ieee80211_sta.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -33,36 +33,36 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 Station mode support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net/bpf.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_sta.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net/bpf.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_sta.h> +#include <net80211/ieee80211_input.h> #ifdef IEEE80211_SUPPORT_SUPERG -#include <freebsd/net80211/ieee80211_superg.h> +#include <net80211/ieee80211_superg.h> #endif -#include <freebsd/net80211/ieee80211_ratectl.h> +#include <net80211/ieee80211_ratectl.h> #define IEEE80211_RATE2MBS(r) (((r) & IEEE80211_RATE_VAL) / 2) diff --git a/freebsd/sys/net80211/ieee80211_sta.h b/freebsd/sys/net80211/ieee80211_sta.h index 43316f5b..1508a7c7 100644 --- a/freebsd/sys/net80211/ieee80211_sta.h +++ b/freebsd/sys/net80211/ieee80211_sta.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_STA_HH_ -#define _NET80211_IEEE80211_STA_HH_ +#ifndef _NET80211_IEEE80211_STA_H_ +#define _NET80211_IEEE80211_STA_H_ /* * Station-mode implementation definitions. @@ -33,4 +33,4 @@ void ieee80211_sta_attach(struct ieee80211com *); void ieee80211_sta_detach(struct ieee80211com *); void ieee80211_sta_vattach(struct ieee80211vap *); -#endif /* !_NET80211_IEEE80211_STA_HH_ */ +#endif /* !_NET80211_IEEE80211_STA_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_superg.c b/freebsd/sys/net80211/ieee80211_superg.c index dd886e41..3fcfcd74 100644 --- a/freebsd/sys/net80211/ieee80211_superg.c +++ b/freebsd/sys/net80211/ieee80211_superg.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting @@ -25,29 +25,29 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/endian.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/kernel.h> +#include <sys/endian.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/bpf.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/if_media.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_input.h> -#include <freebsd/net80211/ieee80211_phy.h> -#include <freebsd/net80211/ieee80211_superg.h> +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_llc.h> +#include <net/if_media.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_input.h> +#include <net80211/ieee80211_phy.h> +#include <net80211/ieee80211_superg.h> /* * Atheros fast-frame encapsulation format. diff --git a/freebsd/sys/net80211/ieee80211_superg.h b/freebsd/sys/net80211/ieee80211_superg.h index bda45dda..970a5fef 100644 --- a/freebsd/sys/net80211/ieee80211_superg.h +++ b/freebsd/sys/net80211/ieee80211_superg.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_SUPERG_HH_ -#define _NET80211_IEEE80211_SUPERG_HH_ +#ifndef _NET80211_IEEE80211_SUPERG_H_ +#define _NET80211_IEEE80211_SUPERG_H_ /* * Atheros' 802.11 SuperG protocol support. @@ -126,4 +126,4 @@ ieee80211_decap_fastframe(struct ieee80211vap *vap, struct ieee80211_node *ni, ieee80211_ff_decap(ni, m) : m; } #endif /* _KERNEL */ -#endif /* _NET80211_IEEE80211_SUPERG_HH_ */ +#endif /* _NET80211_IEEE80211_SUPERG_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_tdma.c b/freebsd/sys/net80211/ieee80211_tdma.c index c41ca491..1a6b3298 100644 --- a/freebsd/sys/net80211/ieee80211_tdma.c +++ b/freebsd/sys/net80211/ieee80211_tdma.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -34,33 +34,33 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 TDMA mode support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_tdma.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net/bpf.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_tdma.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_tdma.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net/bpf.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_tdma.h> +#include <net80211/ieee80211_input.h> #ifndef TDMA_SLOTLEN_DEFAULT #define TDMA_SLOTLEN_DEFAULT 10*1000 /* 10ms */ diff --git a/freebsd/sys/net80211/ieee80211_tdma.h b/freebsd/sys/net80211/ieee80211_tdma.h index 989d6417..2fe591f7 100644 --- a/freebsd/sys/net80211/ieee80211_tdma.h +++ b/freebsd/sys/net80211/ieee80211_tdma.h @@ -25,8 +25,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_TDMA_HH_ -#define _NET80211_IEEE80211_TDMA_HH_ +#ifndef _NET80211_IEEE80211_TDMA_H_ +#define _NET80211_IEEE80211_TDMA_H_ /* * TDMA-mode implementation definitions. @@ -99,4 +99,4 @@ struct ieee80211_beacon_offsets; void ieee80211_tdma_update_beacon(struct ieee80211vap *vap, struct ieee80211_beacon_offsets *bo); #endif /* _KERNEL */ -#endif /* !_NET80211_IEEE80211_TDMA_HH_ */ +#endif /* !_NET80211_IEEE80211_TDMA_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_var.h b/freebsd/sys/net80211/ieee80211_var.h index 2ab54b78..58a46d3b 100644 --- a/freebsd/sys/net80211/ieee80211_var.h +++ b/freebsd/sys/net80211/ieee80211_var.h @@ -25,35 +25,35 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_VAR_HH_ -#define _NET80211_IEEE80211_VAR_HH_ +#ifndef _NET80211_IEEE80211_VAR_H_ +#define _NET80211_IEEE80211_VAR_H_ /* * Definitions for IEEE 802.11 drivers. */ /* NB: portability glue must go first */ #if defined(__NetBSD__) -#include <freebsd/net80211/ieee80211_netbsd.h> +#include <net80211/ieee80211_netbsd.h> #elif defined(__FreeBSD__) -#include <freebsd/net80211/ieee80211_freebsd.h> +#include <net80211/ieee80211_freebsd.h> #elif defined(__linux__) -#include <freebsd/net80211/ieee80211_linux.h> +#include <net80211/ieee80211_linux.h> #else #error "No support for your operating system!" #endif -#include <freebsd/net80211/_ieee80211.h> -#include <freebsd/net80211/ieee80211.h> -#include <freebsd/net80211/ieee80211_ageq.h> -#include <freebsd/net80211/ieee80211_crypto.h> -#include <freebsd/net80211/ieee80211_dfs.h> -#include <freebsd/net80211/ieee80211_ioctl.h> /* for ieee80211_stats */ -#include <freebsd/net80211/ieee80211_phy.h> -#include <freebsd/net80211/ieee80211_power.h> -#include <freebsd/net80211/ieee80211_node.h> -#include <freebsd/net80211/ieee80211_proto.h> -#include <freebsd/net80211/ieee80211_radiotap.h> -#include <freebsd/net80211/ieee80211_scan.h> +#include <net80211/_ieee80211.h> +#include <net80211/ieee80211.h> +#include <net80211/ieee80211_ageq.h> +#include <net80211/ieee80211_crypto.h> +#include <net80211/ieee80211_dfs.h> +#include <net80211/ieee80211_ioctl.h> /* for ieee80211_stats */ +#include <net80211/ieee80211_phy.h> +#include <net80211/ieee80211_power.h> +#include <net80211/ieee80211_node.h> +#include <net80211/ieee80211_proto.h> +#include <net80211/ieee80211_radiotap.h> +#include <net80211/ieee80211_scan.h> #define IEEE80211_TXPOWER_MAX 100 /* .5 dbM (XXX units?) */ #define IEEE80211_TXPOWER_MIN 0 /* kill radio */ @@ -913,4 +913,4 @@ void ieee80211_discard_mac(const struct ieee80211vap *, #define IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) #endif -#endif /* _NET80211_IEEE80211_VAR_HH_ */ +#endif /* _NET80211_IEEE80211_VAR_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_wds.c b/freebsd/sys/net80211/ieee80211_wds.c index b0f5378d..772f305c 100644 --- a/freebsd/sys/net80211/ieee80211_wds.c +++ b/freebsd/sys/net80211/ieee80211_wds.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> #ifdef __FreeBSD__ __FBSDID("$FreeBSD$"); #endif @@ -33,34 +33,34 @@ __FBSDID("$FreeBSD$"); /* * IEEE 802.11 WDS mode support. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_wlan.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/kernel.h> - -#include <freebsd/sys/socket.h> -#include <freebsd/sys/sockio.h> -#include <freebsd/sys/endian.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/if_llc.h> -#include <freebsd/net/ethernet.h> - -#include <freebsd/net/bpf.h> - -#include <freebsd/net80211/ieee80211_var.h> -#include <freebsd/net80211/ieee80211_wds.h> -#include <freebsd/net80211/ieee80211_input.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_wlan.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> + +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/endian.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/if_media.h> +#include <net/if_llc.h> +#include <net/ethernet.h> + +#include <net/bpf.h> + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_wds.h> +#include <net80211/ieee80211_input.h> #ifdef IEEE80211_SUPPORT_SUPERG -#include <freebsd/net80211/ieee80211_superg.h> +#include <net80211/ieee80211_superg.h> #endif static void wds_vattach(struct ieee80211vap *); diff --git a/freebsd/sys/net80211/ieee80211_wds.h b/freebsd/sys/net80211/ieee80211_wds.h index 200cba27..c34fb6ee 100644 --- a/freebsd/sys/net80211/ieee80211_wds.h +++ b/freebsd/sys/net80211/ieee80211_wds.h @@ -24,8 +24,8 @@ * * $FreeBSD$ */ -#ifndef _NET80211_IEEE80211_WDS_HH_ -#define _NET80211_IEEE80211_WDS_HH_ +#ifndef _NET80211_IEEE80211_WDS_H_ +#define _NET80211_IEEE80211_WDS_H_ /* * WDS implementation definitions. @@ -36,4 +36,4 @@ void ieee80211_wds_detach(struct ieee80211com *); void ieee80211_dwds_mcast(struct ieee80211vap *, struct mbuf *); void ieee80211_dwds_discover(struct ieee80211_node *, struct mbuf *); int ieee80211_node_wdsq_age(struct ieee80211_node *); -#endif /* !_NET80211_IEEE80211_WDS_HH_ */ +#endif /* !_NET80211_IEEE80211_WDS_H_ */ diff --git a/freebsd/sys/net80211/ieee80211_xauth.c b/freebsd/sys/net80211/ieee80211_xauth.c index 55318069..7c937906 100644 --- a/freebsd/sys/net80211/ieee80211_xauth.c +++ b/freebsd/sys/net80211/ieee80211_xauth.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2004 Video54 Technologies, Inc. @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <freebsd/sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); /* @@ -41,22 +41,22 @@ __FBSDID("$FreeBSD$"); * of the available callbacks--the user mode authenticator process works * entirely from messages about stations joining and leaving. */ -#include <freebsd/local/opt_wlan.h> +#include <rtems/bsd/local/opt_wlan.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/module.h> +#include <rtems/bsd/sys/param.h> +#include <sys/kernel.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/module.h> -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/if.h> -#include <freebsd/net/if_media.h> -#include <freebsd/net/ethernet.h> -#include <freebsd/net/route.h> +#include <net/if.h> +#include <net/if_media.h> +#include <net/ethernet.h> +#include <net/route.h> -#include <freebsd/net80211/ieee80211_var.h> +#include <net80211/ieee80211_var.h> /* XXX number of references from net80211 layer; needed for module code */ static int nrefs = 0; |