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.

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

@@ -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);

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

johannes

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

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]

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