... isn't really possible at the moment. But you only need to change
some include paths (to be able to include the
net/mac80211/mac80211_common.h header!) and apply this change to be able
to include include/net/mac80211.h into the userspace code.
And no, this shouldn't be applied. Rather should the prism ioctl foo be
deleted.
johannes
--- wireless-dev.orig/include/net/mac80211.h 2007-03-04 01:53:43.719146462 +0100
+++ wireless-dev/include/net/mac80211.h 2007-03-04 01:55:13.489146462 +0100
@@ -10,6 +10,7 @@
#ifndef MAC80211_H
#define MAC80211_H
+#ifdef __KERNEL__
#include <linux/kernel.h>
#include <linux/if_ether.h>
#include <linux/skbuff.h>
@@ -18,7 +19,7 @@
#include <linux/ieee80211.h>
#include <net/wireless.h>
#include <net/cfg80211.h>
-
+#endif
/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
* called in hardware interrupt context. The low-level driver must not call any
* other functions in hardware interrupt context. If there is a need for such
@@ -108,7 +109,7 @@ enum {
MODE_ATHEROS_TURBOG = 4 /* Atheros Turbo mode (2x.11g at 2.4 GHz) */,
NUM_IEEE80211_MODES = 5
};
-
+#ifdef __KERNEL__
struct ieee80211_hw_mode {
int mode; /* MODE_IEEE80211... */
int num_channels; /* Number of channels (below) */
@@ -118,7 +119,7 @@ struct ieee80211_hw_mode {
struct list_head list; /* Internal, don't touch */
};
-
+#endif
struct ieee80211_tx_queue_params {
int aifs; /* 0 .. 255; -1 = use default */
int cw_min; /* 2^n-1: 1, 3, 7, .. , 1023; 0 = use default */
@@ -552,7 +553,7 @@ struct ieee80211_hw {
* WMM requires at least four queues. */
int queues;
};
-
+#ifdef __KERNEL__
static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev)
{
set_wiphy_dev(hw->wiphy, dev);
@@ -1079,4 +1080,6 @@ static inline int ieee80211_get_morefrag
#define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \
((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
+#endif
+
#endif /* MAC80211_H */
On Tue, 2007-03-06 at 10:40 -0500, Dan Williams wrote:
> Right; if there's something that the prism ioctls do that cfg80211
> doesn't, and that something is useful, then we probably need to extend
> cfg80211 to do that thing. Then we rip out all the custom ioctl junk
> everywhere.
Yep. I got bcm43xx working in master mode now so I can start doing
exactly that.
johannes
On Mon, Mar 05, 2007 at 12:58:22PM +0100, Johannes Berg wrote:
> ... isn't really possible at the moment. But you only need to change
> some include paths (to be able to include the
> net/mac80211/mac80211_common.h header!) and apply this change to be able
> to include include/net/mac80211.h into the userspace code.
Which version of hostapd did you try to compile here? The current
development branch does not include net/mac80211.h and the include path
has also been changed from net/d80211 to net/mac80211 in example
configuration.
--
Jouni Malinen PGP id EFC895FA
On Mon, 2007-03-05 at 12:58 +0100, Johannes Berg wrote:
> ... isn't really possible at the moment. But you only need to change
> some include paths (to be able to include the
> net/mac80211/mac80211_common.h header!) and apply this change to be able
> to include include/net/mac80211.h into the userspace code.
>
> And no, this shouldn't be applied. Rather should the prism ioctl foo be
> deleted.
Right; if there's something that the prism ioctls do that cfg80211
doesn't, and that something is useful, then we probably need to extend
cfg80211 to do that thing. Then we rip out all the custom ioctl junk
everywhere.
Dan
> johannes
>
> --- wireless-dev.orig/include/net/mac80211.h 2007-03-04 01:53:43.719146462 +0100
> +++ wireless-dev/include/net/mac80211.h 2007-03-04 01:55:13.489146462 +0100
> @@ -10,6 +10,7 @@
> #ifndef MAC80211_H
> #define MAC80211_H
>
> +#ifdef __KERNEL__
> #include <linux/kernel.h>
> #include <linux/if_ether.h>
> #include <linux/skbuff.h>
> @@ -18,7 +19,7 @@
> #include <linux/ieee80211.h>
> #include <net/wireless.h>
> #include <net/cfg80211.h>
> -
> +#endif
> /* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
> * called in hardware interrupt context. The low-level driver must not call any
> * other functions in hardware interrupt context. If there is a need for such
> @@ -108,7 +109,7 @@ enum {
> MODE_ATHEROS_TURBOG = 4 /* Atheros Turbo mode (2x.11g at 2.4 GHz) */,
> NUM_IEEE80211_MODES = 5
> };
> -
> +#ifdef __KERNEL__
> struct ieee80211_hw_mode {
> int mode; /* MODE_IEEE80211... */
> int num_channels; /* Number of channels (below) */
> @@ -118,7 +119,7 @@ struct ieee80211_hw_mode {
>
> struct list_head list; /* Internal, don't touch */
> };
> -
> +#endif
> struct ieee80211_tx_queue_params {
> int aifs; /* 0 .. 255; -1 = use default */
> int cw_min; /* 2^n-1: 1, 3, 7, .. , 1023; 0 = use default */
> @@ -552,7 +553,7 @@ struct ieee80211_hw {
> * WMM requires at least four queues. */
> int queues;
> };
> -
> +#ifdef __KERNEL__
> static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev)
> {
> set_wiphy_dev(hw->wiphy, dev);
> @@ -1079,4 +1080,6 @@ static inline int ieee80211_get_morefrag
> #define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \
> ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
>
> +#endif
> +
> #endif /* MAC80211_H */
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Mar 05, 2007 at 12:58:22PM +0100, Johannes Berg wrote:
> ... isn't really possible at the moment. But you only need to change
> some include paths (to be able to include the
> net/mac80211/mac80211_common.h header!) and apply this change to be able
> to include include/net/mac80211.h into the userspace code.
>
> And no, this shouldn't be applied. Rather should the prism ioctl foo be
> deleted.
Yepp.
On Mon, 2007-03-05 at 08:44 -0800, Jouni Malinen wrote:
> Which version of hostapd did you try to compile here? The current
> development branch does not include net/mac80211.h and the include path
> has also been changed from net/d80211 to net/mac80211 in example
> configuration.
I was a bit in a hurry and just downloaded the latest release. Thanks
for the heads up, I'll give the dev version a try.
johannes