redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

hostap: convert to net_device_ops 

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Stephen Hemminger 2009-03-20 19:36:43 +00:00 committed by David S. Miller
parent 4cfa8e45f4
commit 5ae4efbcd2
2 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/hostap/hostap_hw.c
View File

@ -3222,7 +3222,6 @@ while (0)
hostap_setup_dev(dev, local, HOSTAP_INTERFACE_MASTER);
dev->hard_start_xmit = hostap_master_start_xmit;
dev->type = ARPHRD_IEEE80211;
dev->header_ops = &hostap_80211_ops;

69
drivers/net/wireless/hostap/hostap_main.c
View File

@ -815,6 +815,46 @@ const struct header_ops hostap_80211_ops = {
};
EXPORT_SYMBOL(hostap_80211_ops);
static const struct net_device_ops hostap_netdev_ops = {
.ndo_start_xmit = hostap_data_start_xmit,
.ndo_open = prism2_open,
.ndo_stop = prism2_close,
.ndo_do_ioctl = hostap_ioctl,
.ndo_set_mac_address = prism2_set_mac_address,
.ndo_set_multicast_list = hostap_set_multicast_list,
.ndo_change_mtu = prism2_change_mtu,
.ndo_tx_timeout = prism2_tx_timeout,
.ndo_validate_addr = eth_validate_addr,
};
static const struct net_device_ops hostap_mgmt_netdev_ops = {
.ndo_start_xmit = hostap_mgmt_start_xmit,
.ndo_open = prism2_open,
.ndo_stop = prism2_close,
.ndo_do_ioctl = hostap_ioctl,
.ndo_set_mac_address = prism2_set_mac_address,
.ndo_set_multicast_list = hostap_set_multicast_list,
.ndo_change_mtu = prism2_change_mtu,
.ndo_tx_timeout = prism2_tx_timeout,
.ndo_validate_addr = eth_validate_addr,
};
static const struct net_device_ops hostap_master_ops = {
.ndo_start_xmit = hostap_master_start_xmit,
.ndo_open = prism2_open,
.ndo_stop = prism2_close,
.ndo_do_ioctl = hostap_ioctl,
.ndo_set_mac_address = prism2_set_mac_address,
.ndo_set_multicast_list = hostap_set_multicast_list,
.ndo_change_mtu = prism2_change_mtu,
.ndo_tx_timeout = prism2_tx_timeout,
.ndo_validate_addr = eth_validate_addr,
};
void hostap_setup_dev(struct net_device *dev, local_info_t *local,
int type)
{
@ -830,30 +870,25 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
iface->wireless_data.spy_data = &iface->spy_data;
dev->wireless_data = &iface->wireless_data;
}
dev->wireless_handlers =
(struct iw_handler_def *) &hostap_iw_handler_def;
dev->do_ioctl = hostap_ioctl;
dev->open = prism2_open;
dev->stop = prism2_close;
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->wireless_handlers = &hostap_iw_handler_def;
dev->watchdog_timeo = TX_TIMEOUT;
if (type == HOSTAP_INTERFACE_AP) {
dev->hard_start_xmit = hostap_mgmt_start_xmit;
switch(type) {
case HOSTAP_INTERFACE_AP:
dev->netdev_ops = &hostap_mgmt_netdev_ops;
dev->type = ARPHRD_IEEE80211;
dev->header_ops = &hostap_80211_ops;
} else {
dev->hard_start_xmit = hostap_data_start_xmit;
break;
case HOSTAP_INTERFACE_MASTER:
dev->tx_queue_len = 0; /* use main radio device queue */
dev->netdev_ops = &hostap_master_ops;
break;
default:
dev->netdev_ops = &hostap_netdev_ops;
}
dev->mtu = local->mtu;
if (type != HOSTAP_INTERFACE_MASTER) {
/* use main radio device queue */
dev->tx_queue_len = 0;
}
SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops);