 @@ -48,34 +48,33 @@
 #include "l2_packet/l2_packet.h"
 struct bsd_driver_global {
 	void		*ctx;
 	int		sock;			/* socket for 802.11 ioctls */
 	int		route;			/* routing socket for events */
 	struct iovec	event_iov[1];
 	struct dl_list	ifaces;			/* list of interfaces */
 };
 struct bsd_driver_data {
 	struct dl_list	list;
 	struct bsd_driver_global *global;
-	struct hostapd_data *hapd;	/* back pointer */
+	void	*ctx;
 	struct l2_packet_data *sock_xmit;/* raw packet xmit socket */
 	char	ifname[IFNAMSIZ+1];	/* interface name */
 	int	flags;
 	unsigned int ifindex;		/* interface index */
 	int	if_removed;		/* has the interface been removed? */
 	void	*ctx;
 	struct wpa_driver_capa capa;	/* driver capability */
 	int	is_ap;			/* Access point mode */
 	int	prev_roaming;	/* roaming state to restore on deinit */
 	int	prev_privacy;	/* privacy state to restore on deinit */
 	int	prev_wpa;	/* wpa state to restore on deinit */
 	enum ieee80211_opmode opmode;	/* operation mode */
 };
 /* Generic functions for hostapd and wpa_supplicant */
 #define IOVEC_BUFSIZ		256
 ssize_t
 recvmsg_realloc(int fd, struct msghdr *msg, int flags)
 @@ -833,81 +832,81 @@ bsd_wireless_event_receive(int sock, voi
 	case RTM_IEEE80211:
 		ifan = (struct if_announcemsghdr *) rtm;
 		drv = bsd_get_drvindex(global, ifan->ifan_index);
 		if (drv == NULL)
 			return;
 		switch (ifan->ifan_what) {
 		case RTM_IEEE80211_ASSOC:
 		case RTM_IEEE80211_REASSOC:
 		case RTM_IEEE80211_DISASSOC:
 		case RTM_IEEE80211_SCAN:
 			break;
 		case RTM_IEEE80211_LEAVE:
 			leave = (struct ieee80211_leave_event *) &ifan[1];
-			drv_event_disassoc(drv->hapd, leave->iev_addr);
+			drv_event_disassoc(drv->ctx, leave->iev_addr);
 			break;
 		case RTM_IEEE80211_JOIN:
 #ifdef RTM_IEEE80211_REJOIN
 		case RTM_IEEE80211_REJOIN:
 #endif
 			join = (struct ieee80211_join_event *) &ifan[1];
-			bsd_new_sta(drv, drv->hapd, join->iev_addr);
+			bsd_new_sta(drv, drv->ctx, join->iev_addr);
 			break;
 		case RTM_IEEE80211_REPLAY:
 			/* ignore */
 			break;
 		case RTM_IEEE80211_MICHAEL:
 			mic = (struct ieee80211_michael_event *) &ifan[1];
 			wpa_printf(MSG_DEBUG,
 				"Michael MIC failure wireless event: "
 				"keyix=%u src_addr=" MACSTR, mic->iev_keyix,
 				MAC2STR(mic->iev_src));
 			os_memset(&data, 0, sizeof(data));
 			data.michael_mic_failure.unicast = 1;
 			data.michael_mic_failure.src = mic->iev_src;
-			wpa_supplicant_event(drv->hapd,
+			wpa_supplicant_event(drv->ctx,
 					     EVENT_MICHAEL_MIC_FAILURE, &data);
 			break;
+		}
 		break;
+	}
+}
 static void
 handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
+{
 	struct bsd_driver_data *drv = ctx;
-	drv_event_eapol_rx(drv->hapd, src_addr, buf, len);
+	drv_event_eapol_rx(drv->ctx, src_addr, buf, len);
+}
 static void *
 bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
+{
 	struct bsd_driver_data *drv;
 	drv = os_zalloc(sizeof(struct bsd_driver_data));
 	if (drv == NULL) {
 		wpa_printf(MSG_ERROR, "Could not allocate memory for bsd driver data");
 		return NULL;
+	}
 	drv->ifindex = if_nametoindex(params->ifname);
 	if (drv->ifindex == 0) {
 		wpa_printf(MSG_DEBUG, "%s: interface %s does not exist",
 			   __func__, params->ifname);
 		goto bad;
+	}
-	drv->hapd = hapd;
+	drv->ctx = hapd;
 	drv->global = params->global_priv;
 	os_strlcpy(drv->ifname, params->ifname, sizeof(drv->ifname));
 	drv->sock_xmit = l2_packet_init(drv->ifname, NULL, ETH_P_EAPOL,
 					handle_read, drv, 0);
 	if (drv->sock_xmit == NULL)
 		goto bad;
 	if (l2_packet_get_own_addr(drv->sock_xmit, params->own_addr))
 		goto bad;
 	/* mark down during setup */
 	if (bsd_ctrl_iface(drv, 0) < 0)
 		goto bad;