From: Daniel Drake <dsd@gentoo.org>

Index: linux/drivers/net/wireless/hostap/hostap.h
===================================================================
--- linux.orig/drivers/net/wireless/hostap/hostap.h
+++ linux/drivers/net/wireless/hostap/hostap.h
@@ -35,7 +35,7 @@ int hostap_80211_prism_header_parse(stru
 int hostap_80211_get_hdrlen(u16 fc);
 struct net_device_stats *hostap_get_stats(struct net_device *dev);
 void hostap_setup_dev(struct net_device *dev, local_info_t *local,
-		      int main_dev);
+		      int main_dev, int type);
 void hostap_set_multicast_list_queue(struct work_struct *work);
 int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);
 int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);
Index: linux/drivers/net/wireless/hostap/hostap_hw.c
===================================================================
--- linux.orig/drivers/net/wireless/hostap/hostap_hw.c
+++ linux/drivers/net/wireless/hostap/hostap_hw.c
@@ -3254,7 +3254,7 @@ while (0)
 
 	INIT_LIST_HEAD(&local->bss_list);
 
-	hostap_setup_dev(dev, local, 1);
+	hostap_setup_dev(dev, local, 1, HOSTAP_INTERFACE_MASTER);
 	local->saved_eth_header_parse = dev->hard_header_parse;
 
 	dev->hard_start_xmit = hostap_master_start_xmit;
Index: linux/drivers/net/wireless/hostap/hostap_main.c
===================================================================
--- linux.orig/drivers/net/wireless/hostap/hostap_main.c
+++ linux/drivers/net/wireless/hostap/hostap_main.c
@@ -73,7 +73,7 @@ struct net_device * hostap_add_interface
 	dev->mem_start = mdev->mem_start;
 	dev->mem_end = mdev->mem_end;
 
-	hostap_setup_dev(dev, local, 0);
+	hostap_setup_dev(dev, local, 0, type);
 	dev->destructor = free_netdev;
 
 	sprintf(dev->name, "%s%s", prefix, name);
@@ -839,7 +839,7 @@ static void prism2_tx_timeout(struct net
 
 
 void hostap_setup_dev(struct net_device *dev, local_info_t *local,
-		      int main_dev)
+		      int main_dev, int type)
 {
 	struct hostap_interface *iface;
 
@@ -859,13 +859,20 @@ void hostap_setup_dev(struct net_device 
 	dev->do_ioctl = hostap_ioctl;
 	dev->open = prism2_open;
 	dev->stop = prism2_close;
-	dev->hard_start_xmit = hostap_data_start_xmit;
 	dev->set_mac_address = prism2_set_mac_address;
 	dev->set_multicast_list = hostap_set_multicast_list;
 	dev->change_mtu = prism2_change_mtu;
 	dev->tx_timeout = prism2_tx_timeout;
 	dev->watchdog_timeo = TX_TIMEOUT;
 
+	if (type == HOSTAP_INTERFACE_AP) {
+		dev->hard_start_xmit = hostap_mgmt_start_xmit;
+		dev->type = ARPHRD_IEEE80211;
+		dev->hard_header_parse = hostap_80211_header_parse;
+	} else {
+		dev->hard_start_xmit = hostap_data_start_xmit;
+	}
+
 	dev->mtu = local->mtu;
 	if (!main_dev) {
 		/* use main radio device queue */
@@ -893,10 +900,6 @@ static int hostap_enable_hostapd(local_i
 	if (local->apdev == NULL)
 		return -ENOMEM;
 
-	local->apdev->hard_start_xmit = hostap_mgmt_start_xmit;
-	local->apdev->type = ARPHRD_IEEE80211;
-	local->apdev->hard_header_parse = hostap_80211_header_parse;
-
 	return 0;
 }