2007-09-29 12:36:11

by Johannes Berg

[permalink] [raw]
Subject: [PATCH] hostapd: adjust for changed nl80211

Before pushing nl80211 into mainline I cleaned it up
and made it more object oriented. This led to a rename
of some things hostapd is already using, so it needs
to be adjusted.

Signed-off-by: Johannes Berg <[email protected]>

---
hostapd/driver_devicescape.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- hostap.orig/hostapd/driver_devicescape.c 2007-09-26 14:43:47.000000000 +0200
+++ hostap/hostapd/driver_devicescape.c 2007-09-26 14:43:48.000000000 +0200
@@ -783,7 +783,7 @@ static void nl80211_remove_iface(struct
goto nla_put_failure;

genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
- 0, NL80211_CMD_DEL_VIRTUAL_INTERFACE, 0);
+ 0, NL80211_CMD_DEL_INTERFACE, 0);
NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifidx);
if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
nl_wait_for_ack(drv->nl_handle) < 0)
@@ -808,7 +808,7 @@ static int nl80211_create_iface(struct i
return -1;

genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
- 0, NL80211_CMD_ADD_VIRTUAL_INTERFACE, 0);
+ 0, NL80211_CMD_NEW_INTERFACE, 0);
NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
if_nametoindex(drv->hapd->conf->iface));
NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, ifname);




2007-10-03 03:10:21

by Jouni Malinen

[permalink] [raw]
Subject: Re: [PATCH] hostapd: adjust for changed nl80211

On Sat, Sep 29, 2007 at 02:37:33PM +0200, Johannes Berg wrote:
> Before pushing nl80211 into mainline I cleaned it up
> and made it more object oriented. This led to a rename
> of some things hostapd is already using, so it needs
> to be adjusted.

> hostapd/driver_devicescape.c | 4 ++--
> genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
> - 0, NL80211_CMD_DEL_VIRTUAL_INTERFACE, 0);
> + 0, NL80211_CMD_DEL_INTERFACE, 0);

I did not find this change from wireless-dev.git#everything.. Am I
missing something or has this not been applied to the kernel yet?

--
Jouni Malinen PGP id EFC895FA

2007-10-04 13:39:06

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH] hostapd: adjust for changed nl80211

On Wed, Oct 03, 2007 at 09:09:57PM -0700, Jouni Malinen wrote:
> On Wed, Oct 03, 2007 at 08:46:35AM +0200, Johannes Berg wrote:
> > On Tue, 2007-10-02 at 20:09 -0700, Jouni Malinen wrote:
> > > I did not find this change from wireless-dev.git#everything.. Am I
> > > missing something or has this not been applied to the kernel yet?
> >
> > You missed that wireless-dev is dead and we're using
> > wireless-2.6#everything now.
>
> OK. Though, hostapd does not build at all against that due to
> net/mac80211/hostapd_ioctl.h not existing.. Anyway, with a copy of

Until Johannes starts hosting his mac80211-hostap tree, I think you
can use wireless-2.6#mac80211-attic. I've been trying to keep that
available for those who need it in the meantime. Fair warning,
it is untested and may simply not work...

Hth?

John
--
John W. Linville
[email protected]

2007-10-04 18:05:00

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] hostapd: adjust for changed nl80211

On Thu, 2007-10-04 at 09:08 -0400, John W. Linville wrote:

> Until Johannes starts hosting his mac80211-hostap tree, I think you
> can use wireless-2.6#mac80211-attic. I've been trying to keep that
> available for those who need it in the meantime. Fair warning,
> it is untested and may simply not work...

I actually sort of do have a tree, if you take my regular patches dir
you'll find a bunch of patches to "make hostapd work". They do, however,
require additional hostapd patches that are WIP, also in my patches dir
(click through from http://johannes.sipsolutions.net/patches/)

johannes


Attachments:
signature.asc (828.00 B)
This is a digitally signed message part

2007-10-04 04:10:32

by Jouni Malinen

[permalink] [raw]
Subject: Re: [PATCH] hostapd: adjust for changed nl80211

On Wed, Oct 03, 2007 at 08:46:35AM +0200, Johannes Berg wrote:
> On Tue, 2007-10-02 at 20:09 -0700, Jouni Malinen wrote:
> > I did not find this change from wireless-dev.git#everything.. Am I
> > missing something or has this not been applied to the kernel yet?
>
> You missed that wireless-dev is dead and we're using
> wireless-2.6#everything now.

OK. Though, hostapd does not build at all against that due to
net/mac80211/hostapd_ioctl.h not existing.. Anyway, with a copy of
previous version of this file, I can build driver_devicescape.c and see
the change in include/linux/nl80211.h. I applied your patch to changing
the nl80211 commands for new/del interface.

--
Jouni Malinen PGP id EFC895FA

2007-10-03 06:46:39

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] hostapd: adjust for changed nl80211

On Tue, 2007-10-02 at 20:09 -0700, Jouni Malinen wrote:

> I did not find this change from wireless-dev.git#everything.. Am I
> missing something or has this not been applied to the kernel yet?

You missed that wireless-dev is dead and we're using
wireless-2.6#everything now.

johannes


Attachments:
signature.asc (828.00 B)
This is a digitally signed message part