From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Thu, 16 Apr 2009 16:08:58 +0000 (+0300)
Subject: Remove dead code related to WDS setup
X-Git-Url: https://vcs.maemo.org/git/?p=wpasupplicant;a=commitdiff_plain;h=b8c4d6df5faab91c4e799989267f204a1637e5cf

Remove dead code related to WDS setup

hostapd does not have any code that would actually call this, so there
is no current need to try to figure out how to set up WDS links with
nl80211.
---

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 6962942..54c3fe3 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -492,7 +492,7 @@ struct hostapd_freq_params {
 };
 
 enum hostapd_driver_if_type {
-	HOSTAPD_IF_VLAN, HOSTAPD_IF_WDS
+	HOSTAPD_IF_VLAN
 };
 
 struct wpa_init_params {
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 2dcd6f2..f4734c2 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2318,9 +2318,6 @@ static int nl80211_create_iface(struct wpa_driver_nl80211_data *drv,
 	int ret = -ENOBUFS;
 #ifdef HOSTAPD
 	struct ifreq ifreq;
-#ifndef NO_WEXT
-	struct iwreq iwr;
-#endif /* NO_WEXT */
 #endif /* HOSTAPD */
 
 	msg = nlmsg_alloc();
@@ -2379,18 +2376,6 @@ static int nl80211_create_iface(struct wpa_driver_nl80211_data *drv,
 				return -1;
 			}
 			break;
-		case NL80211_IFTYPE_WDS:
-#ifdef NO_WEXT
-			return -1;
-#else /* NO_WEXT */
-			memset(&iwr, 0, sizeof(iwr));
-			os_strlcpy(iwr.ifr_name, ifname, IFNAMSIZ);
-			iwr.u.addr.sa_family = ARPHRD_ETHER;
-			memcpy(iwr.u.addr.sa_data, addr, ETH_ALEN);
-			if (ioctl(drv->ioctl_sock, SIOCSIWAP, &iwr))
-				return -1;
-			break;
-#endif /* NO_WEXT */
 		default:
 			/* nothing */
 			break;
@@ -3779,8 +3764,6 @@ static enum nl80211_iftype i802_if_type(enum hostapd_driver_if_type type)
 	switch (type) {
 	case HOSTAPD_IF_VLAN:
 		return NL80211_IFTYPE_AP_VLAN;
-	case HOSTAPD_IF_WDS:
-		return NL80211_IFTYPE_WDS;
 	}
 	return -1;
 }