From: Jouni Malinen <j@w1.fi>
Date: Sun, 3 Nov 2013 16:20:28 +0000 (+0200)
Subject: hostapd: Fill in phyname automatically
X-Git-Tag: hostap_2_1~647
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2db938e8dee448048a1a4a1f95980f5ec7dab381;p=thirdparty%2Fhostap.git

hostapd: Fill in phyname automatically

If per-BSS configuration enabling did not provide a phy name, iface->phy
was left empty. It can be helpful to set this up automatically, so fill
that when initializing the interface.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index 024339ab8..68d3efaba 100644
--- a/src/ap/ap_drv_ops.h
+++ b/src/ap/ap_drv_ops.h
@@ -1,6 +1,6 @@
 /*
  * hostapd - Driver operations
- * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2009-2013, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -249,4 +249,12 @@ static inline int hostapd_get_country(struct hostapd_data *hapd, char *alpha2)
 	return hapd->driver->get_country(hapd->drv_priv, alpha2);
 }
 
+static inline const char * hostapd_drv_get_radio_name(struct hostapd_data *hapd)
+{
+	if (hapd->driver == NULL || hapd->drv_priv == NULL ||
+	    hapd->driver->get_radio_name == NULL)
+		return NULL;
+	return hapd->driver->get_radio_name(hapd->drv_priv);
+}
+
 #endif /* AP_DRV_OPS */
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 3483b6486..673c8140e 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -965,6 +965,14 @@ static int setup_interface(struct hostapd_iface *iface)
 	struct hostapd_data *hapd = iface->bss[0];
 	size_t i;
 
+	if (!iface->phy[0]) {
+		const char *phy = hostapd_drv_get_radio_name(hapd);
+		if (phy) {
+			wpa_printf(MSG_DEBUG, "phy: %s", phy);
+			os_strlcpy(iface->phy, phy, sizeof(iface->phy));
+		}
+	}
+
 	/*
 	 * Make sure that all BSSes get configured with a pointer to the same
 	 * driver interface.