Attachment #131838 for bug #159646

Lines 35-41 int hostap_80211_prism_header_parse(stru Link Here

(-)linux/drivers/net/wireless/hostap/hostap.h (-1 / +1 lines)
35	int hostap_80211_get_hdrlen(u16 fc);	35	int hostap_80211_get_hdrlen(u16 fc);
36	struct net_device_stats hostap_get_stats(struct net_device dev);	36	struct net_device_stats hostap_get_stats(struct net_device dev);
37	void hostap_setup_dev(struct net_device dev, local_info_t local,	37	void hostap_setup_dev(struct net_device dev, local_info_t local,
38	int main_dev);	38	int main_dev, int type);
39	void hostap_set_multicast_list_queue(struct work_struct *work);	39	void hostap_set_multicast_list_queue(struct work_struct *work);
40	int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);	40	int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);
41	int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);	41	int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);

Lines 3254-3260 while (0) Link Here

(-)linux/drivers/net/wireless/hostap/hostap_hw.c (-1 / +1 lines)
3254		3254
3255	INIT_LIST_HEAD(&local->bss_list);	3255	INIT_LIST_HEAD(&local->bss_list);
3256		3256
3257	hostap_setup_dev(dev, local, 1);	3257	hostap_setup_dev(dev, local, 1, HOSTAP_INTERFACE_MASTER);
3258	local->saved_eth_header_parse = dev->hard_header_parse;	3258	local->saved_eth_header_parse = dev->hard_header_parse;
3259		3259
3260	dev->hard_start_xmit = hostap_master_start_xmit;	3260	dev->hard_start_xmit = hostap_master_start_xmit;




	dev->mem_start = mdev->mem_start;
	dev->mem_end = mdev->mem_end;

	hostap_setup_dev(dev, local, 0, type);
	dev->destructor = free_netdev;

	sprintf(dev->name, "%s%s", prefix, name);



void hostap_setup_dev(struct net_device *dev, local_info_t *local,
		      int main_dev, int type)
{
	struct hostap_interface *iface;


	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 */

	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;
}


Return to bug 159646

Lines 73-79 struct net_device * hostap_add_interface Link Here

(-)linux/drivers/net/wireless/hostap/hostap_main.c (-7 / +10 lines)
73	dev->mem_start = mdev->mem_start;	73	dev->mem_start = mdev->mem_start;
74	dev->mem_end = mdev->mem_end;	74	dev->mem_end = mdev->mem_end;
75		75
76	hostap_setup_dev(dev, local, 0);	76	hostap_setup_dev(dev, local, 0, type);
77	dev->destructor = free_netdev;	77	dev->destructor = free_netdev;
78		78
79	sprintf(dev->name, "%s%s", prefix, name);	79	sprintf(dev->name, "%s%s", prefix, name);
Lines 839-845 static void prism2_tx_timeout(struct net Link Here
839		839
840		840
841	void hostap_setup_dev(struct net_device dev, local_info_t local,	841	void hostap_setup_dev(struct net_device dev, local_info_t local,
842	int main_dev)	842	int main_dev, int type)
843	{	843	{
844	struct hostap_interface *iface;	844	struct hostap_interface *iface;
845		845
Lines 859-871 void hostap_setup_dev(struct net_device Link Here
859	dev->do_ioctl = hostap_ioctl;	859	dev->do_ioctl = hostap_ioctl;
860	dev->open = prism2_open;	860	dev->open = prism2_open;
861	dev->stop = prism2_close;	861	dev->stop = prism2_close;
862	dev->hard_start_xmit = hostap_data_start_xmit;
863	dev->set_mac_address = prism2_set_mac_address;	862	dev->set_mac_address = prism2_set_mac_address;
864	dev->set_multicast_list = hostap_set_multicast_list;	863	dev->set_multicast_list = hostap_set_multicast_list;
865	dev->change_mtu = prism2_change_mtu;	864	dev->change_mtu = prism2_change_mtu;
866	dev->tx_timeout = prism2_tx_timeout;	865	dev->tx_timeout = prism2_tx_timeout;
867	dev->watchdog_timeo = TX_TIMEOUT;	866	dev->watchdog_timeo = TX_TIMEOUT;
868		867
		868	if (type == HOSTAP_INTERFACE_AP) {
		869	dev->hard_start_xmit = hostap_mgmt_start_xmit;
		870	dev->type = ARPHRD_IEEE80211;
		871	dev->hard_header_parse = hostap_80211_header_parse;
		872	} else {
		873	dev->hard_start_xmit = hostap_data_start_xmit;
		874	}
		875
869	dev->mtu = local->mtu;	876	dev->mtu = local->mtu;
870	if (!main_dev) {	877	if (!main_dev) {
871	/* use main radio device queue */	878	/* use main radio device queue */
Lines 893-902 static int hostap_enable_hostapd(local_i Link Here
893	if (local->apdev == NULL)	900	if (local->apdev == NULL)
894	return -ENOMEM;	901	return -ENOMEM;
895		902
896	local->apdev->hard_start_xmit = hostap_mgmt_start_xmit;
897	local->apdev->type = ARPHRD_IEEE80211;
898	local->apdev->hard_header_parse = hostap_80211_header_parse;
899
900	return 0;	903	return 0;
901	}	904	}
902		905