This removes the VLAN stuff from hostapd.
The VLAN stuff in mac80211 cannot possibly work, it doesn't actually do
anything with those VLAN type interfaces. Also, when I added the VLAN
type to cfg80211 I must have been rather convinced of the idea; I no
longer am in favour of doing it in the wireless stack. The recently
added "macvlan" "driver" shows how you can do VLANs based on destination
address, what we will need is something like "smacvlan" that does VLANs
based on source address.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
---
Rediffed to apply just on top of the eloop fix I just sent and not
require any other patches.
hostapd/ChangeLog | 2 ++
hostapd/driver_devicescape.c | 18 ------------------
2 files changed, 2 insertions(+), 18 deletions(-)
--- hostap.orig/hostapd/driver_devicescape.c 2007-08-15 14:21:37.000000000 +0200
+++ hostap/hostapd/driver_devicescape.c 2007-08-15 14:21:58.000000000 +0200
@@ -972,8 +972,6 @@ static int i802_set_short_slot_time(void
static int i802_if_type(enum hostapd_driver_if_type type)
{
switch (type) {
- case HOSTAPD_IF_VLAN:
- return HOSTAP_IF_VLAN;
case HOSTAPD_IF_WDS:
return HOSTAP_IF_WDS;
}
@@ -1141,21 +1139,6 @@ static struct hostapd_hw_modes * i802_ge
}
-static int i802_set_sta_vlan(void *priv, const u8 *addr, const char *ifname,
- int vlan_id)
-{
- struct i802_driver_data *drv = priv;
- struct prism2_hostapd_param param;
-
- memset(¶m, 0, sizeof(param));
- param.cmd = PRISM2_HOSTAPD_SET_STA_VLAN;
- memcpy(param.sta_addr, addr, ETH_ALEN);
- os_strlcpy(param.u.set_sta_vlan.vlan_name, ifname, IFNAMSIZ);
- param.u.set_sta_vlan.vlan_id = vlan_id;
- return hostapd_ioctl(drv, ¶m, sizeof(param));
-}
-
-
static void handle_data(struct hostapd_data *hapd, u8 *buf, size_t len,
u16 stype, struct ieee80211_frame_info *fi)
{
@@ -2000,5 +1983,4 @@ const struct wpa_driver_ops wpa_driver_d
.if_update = i802_if_update,
.if_remove = i802_if_remove,
.get_hw_feature_data = i802_get_hw_feature_data,
- .set_sta_vlan = i802_set_sta_vlan,
};
--- hostap.orig/hostapd/ChangeLog 2007-08-15 14:21:37.000000000 +0200
+++ hostap/hostapd/ChangeLog 2007-08-15 14:21:37.000000000 +0200
@@ -16,6 +16,8 @@ ChangeLog for hostapd
either need to support this or will have to use the WPA/RSN IEs from
hostapd; currently, the included madwifi and bsd driver interfaces do
not have support for this)
+ * removed VLAN support from devicescape driver, the kernel isn't up
+ to it and it need not live in the wireless stack at all.
2007-05-28 - v0.6.0
* added experimental IEEE 802.11r/D6.0 support
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
