Commit f9d540ee authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

[MAC80211]: remove management interface

Removes the management interface since it is only required
for hostapd/userspace MLME, will not be in the final tree
at least in this form and hostapd/userspace MLME currently
do not work against this tree anyway.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2897552
...@@ -472,7 +472,6 @@ struct ieee80211_conf { ...@@ -472,7 +472,6 @@ struct ieee80211_conf {
enum ieee80211_if_types { enum ieee80211_if_types {
IEEE80211_IF_TYPE_INVALID, IEEE80211_IF_TYPE_INVALID,
IEEE80211_IF_TYPE_AP, IEEE80211_IF_TYPE_AP,
IEEE80211_IF_TYPE_MGMT,
IEEE80211_IF_TYPE_STA, IEEE80211_IF_TYPE_STA,
IEEE80211_IF_TYPE_IBSS, IEEE80211_IF_TYPE_IBSS,
IEEE80211_IF_TYPE_MNTR, IEEE80211_IF_TYPE_MNTR,
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/cfg80211.h> #include <net/cfg80211.h>
#include "ieee80211_common.h"
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_rate.h" #include "ieee80211_rate.h"
#include "wep.h" #include "wep.h"
...@@ -123,151 +122,6 @@ static void ieee80211_master_set_multicast_list(struct net_device *dev) ...@@ -123,151 +122,6 @@ static void ieee80211_master_set_multicast_list(struct net_device *dev)
ieee80211_configure_filter(local); ieee80211_configure_filter(local);
} }
/* management interface */
static void
ieee80211_fill_frame_info(struct ieee80211_local *local,
struct ieee80211_frame_info *fi,
struct ieee80211_rx_status *status)
{
if (status) {
struct timespec ts;
struct ieee80211_rate *rate;
jiffies_to_timespec(jiffies, &ts);
fi->hosttime = cpu_to_be64((u64) ts.tv_sec * 1000000 +
ts.tv_nsec / 1000);
fi->mactime = cpu_to_be64(status->mactime);
switch (status->phymode) {
case MODE_IEEE80211A:
fi->phytype = htonl(ieee80211_phytype_ofdm_dot11_a);
break;
case MODE_IEEE80211B:
fi->phytype = htonl(ieee80211_phytype_dsss_dot11_b);
break;
case MODE_IEEE80211G:
fi->phytype = htonl(ieee80211_phytype_pbcc_dot11_g);
break;
default:
fi->phytype = htonl(0xAAAAAAAA);
break;
}
fi->channel = htonl(status->channel);
rate = ieee80211_get_rate(local, status->phymode,
status->rate);
if (rate) {
fi->datarate = htonl(rate->rate);
if (rate->flags & IEEE80211_RATE_PREAMBLE2) {
if (status->rate == rate->val)
fi->preamble = htonl(2); /* long */
else if (status->rate == rate->val2)
fi->preamble = htonl(1); /* short */
} else
fi->preamble = htonl(0);
} else {
fi->datarate = htonl(0);
fi->preamble = htonl(0);
}
fi->antenna = htonl(status->antenna);
fi->priority = htonl(0xffffffff); /* no clue */
fi->ssi_type = htonl(ieee80211_ssi_raw);
fi->ssi_signal = htonl(status->ssi);
fi->ssi_noise = 0x00000000;
fi->encoding = 0;
} else {
/* clear everything because we really don't know.
* the msg_type field isn't present on monitor frames
* so we don't know whether it will be present or not,
* but it's ok to not clear it since it'll be assigned
* anyway */
memset(fi, 0, sizeof(*fi) - sizeof(fi->msg_type));
fi->ssi_type = htonl(ieee80211_ssi_none);
}
fi->version = htonl(IEEE80211_FI_VERSION);
fi->length = cpu_to_be32(sizeof(*fi) - sizeof(fi->msg_type));
}
/* this routine is actually not just for this, but also
* for pushing fake 'management' frames into userspace.
* it shall be replaced by a netlink-based system. */
void
ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb,
struct ieee80211_rx_status *status, u32 msg_type)
{
struct ieee80211_frame_info *fi;
const size_t hlen = sizeof(struct ieee80211_frame_info);
struct net_device *dev = local->apdev;
skb->dev = dev;
if (skb_headroom(skb) < hlen) {
I802_DEBUG_INC(local->rx_expand_skb_head);
if (pskb_expand_head(skb, hlen, 0, GFP_ATOMIC)) {
dev_kfree_skb(skb);
return;
}
}
fi = (struct ieee80211_frame_info *) skb_push(skb, hlen);
ieee80211_fill_frame_info(local, fi, status);
fi->msg_type = htonl(msg_type);
dev->stats.rx_packets++;
dev->stats.rx_bytes += skb->len;
skb_set_mac_header(skb, 0);
skb->ip_summed = CHECKSUM_UNNECESSARY;
skb->pkt_type = PACKET_OTHERHOST;
skb->protocol = htons(ETH_P_802_2);
memset(skb->cb, 0, sizeof(skb->cb));
netif_rx(skb);
}
static int ieee80211_mgmt_open(struct net_device *dev)
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
if (!netif_running(local->mdev))
return -EOPNOTSUPP;
return 0;
}
static int ieee80211_mgmt_stop(struct net_device *dev)
{
return 0;
}
static int ieee80211_change_mtu_apdev(struct net_device *dev, int new_mtu)
{
/* FIX: what would be proper limits for MTU?
* This interface uses 802.11 frames. */
if (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN) {
printk(KERN_WARNING "%s: invalid MTU %d\n",
dev->name, new_mtu);
return -EINVAL;
}
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu);
#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
dev->mtu = new_mtu;
return 0;
}
void ieee80211_if_mgmt_setup(struct net_device *dev)
{
ether_setup(dev);
dev->hard_start_xmit = ieee80211_mgmt_start_xmit;
dev->change_mtu = ieee80211_change_mtu_apdev;
dev->open = ieee80211_mgmt_open;
dev->stop = ieee80211_mgmt_stop;
dev->type = ARPHRD_IEEE80211_PRISM;
dev->destructor = ieee80211_if_free;
}
/* regular interfaces */ /* regular interfaces */
static int ieee80211_change_mtu(struct net_device *dev, int new_mtu) static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
...@@ -345,7 +199,6 @@ static int ieee80211_open(struct net_device *dev) ...@@ -345,7 +199,6 @@ static int ieee80211_open(struct net_device *dev)
return -ENOLINK; return -ENOLINK;
break; break;
case IEEE80211_IF_TYPE_AP: case IEEE80211_IF_TYPE_AP:
case IEEE80211_IF_TYPE_MGMT:
case IEEE80211_IF_TYPE_STA: case IEEE80211_IF_TYPE_STA:
case IEEE80211_IF_TYPE_MNTR: case IEEE80211_IF_TYPE_MNTR:
case IEEE80211_IF_TYPE_IBSS: case IEEE80211_IF_TYPE_IBSS:
...@@ -410,10 +263,6 @@ static int ieee80211_open(struct net_device *dev) ...@@ -410,10 +263,6 @@ static int ieee80211_open(struct net_device *dev)
if (local->open_count == 0) { if (local->open_count == 0) {
res = dev_open(local->mdev); res = dev_open(local->mdev);
WARN_ON(res); WARN_ON(res);
if (local->apdev) {
res = dev_open(local->apdev);
WARN_ON(res);
}
tasklet_enable(&local->tx_pending_tasklet); tasklet_enable(&local->tx_pending_tasklet);
tasklet_enable(&local->tasklet); tasklet_enable(&local->tasklet);
} }
...@@ -499,9 +348,6 @@ static int ieee80211_stop(struct net_device *dev) ...@@ -499,9 +348,6 @@ static int ieee80211_stop(struct net_device *dev)
if (netif_running(local->mdev)) if (netif_running(local->mdev))
dev_close(local->mdev); dev_close(local->mdev);
if (local->apdev)
dev_close(local->apdev);
if (local->ops->stop) if (local->ops->stop)
local->ops->stop(local_to_hw(local)); local->ops->stop(local_to_hw(local));
...@@ -550,7 +396,7 @@ static const struct header_ops ieee80211_header_ops = { ...@@ -550,7 +396,7 @@ static const struct header_ops ieee80211_header_ops = {
.cache_update = eth_header_cache_update, .cache_update = eth_header_cache_update,
}; };
/* Must not be called for mdev and apdev */ /* Must not be called for mdev */
void ieee80211_if_setup(struct net_device *dev) void ieee80211_if_setup(struct net_device *dev)
{ {
ether_setup(dev); ether_setup(dev);
...@@ -806,8 +652,6 @@ static void ieee80211_remove_tx_extra(struct ieee80211_local *local, ...@@ -806,8 +652,6 @@ static void ieee80211_remove_tx_extra(struct ieee80211_local *local,
pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT; pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
if (control->flags & IEEE80211_TXCTL_REQUEUE) if (control->flags & IEEE80211_TXCTL_REQUEUE)
pkt_data->flags |= IEEE80211_TXPD_REQUEUE; pkt_data->flags |= IEEE80211_TXPD_REQUEUE;
if (control->type == IEEE80211_IF_TYPE_MGMT)
pkt_data->flags |= IEEE80211_TXPD_MGMT_IFACE;
pkt_data->queue = control->queue; pkt_data->queue = control->queue;
hdrlen = ieee80211_get_hdrlen_from_skb(skb); hdrlen = ieee80211_get_hdrlen_from_skb(skb);
...@@ -860,7 +704,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, ...@@ -860,7 +704,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
u16 frag, type; u16 frag, type;
u32 msg_type;
struct ieee80211_tx_status_rtap_hdr *rthdr; struct ieee80211_tx_status_rtap_hdr *rthdr;
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
int monitors; int monitors;
...@@ -975,29 +818,9 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, ...@@ -975,29 +818,9 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
local->dot11FailedCount++; local->dot11FailedCount++;
} }
msg_type = (status->flags & IEEE80211_TX_STATUS_ACK) ?
ieee80211_msg_tx_callback_ack : ieee80211_msg_tx_callback_fail;
/* this was a transmitted frame, but now we want to reuse it */ /* this was a transmitted frame, but now we want to reuse it */
skb_orphan(skb); skb_orphan(skb);
if ((status->control.flags & IEEE80211_TXCTL_REQ_TX_STATUS) &&
local->apdev) {
if (local->monitors) {
skb2 = skb_clone(skb, GFP_ATOMIC);
} else {
skb2 = skb;
skb = NULL;
}
if (skb2)
/* Send frame to hostapd */
ieee80211_rx_mgmt(local, skb2, NULL, msg_type);
if (!skb)
return;
}
if (!local->monitors) { if (!local->monitors) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
return; return;
...@@ -1344,8 +1167,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) ...@@ -1344,8 +1167,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
BUG_ON(local->reg_state != IEEE80211_DEV_REGISTERED); BUG_ON(local->reg_state != IEEE80211_DEV_REGISTERED);
local->reg_state = IEEE80211_DEV_UNREGISTERED; local->reg_state = IEEE80211_DEV_UNREGISTERED;
if (local->apdev)
ieee80211_if_del_mgmt(local);
/* /*
* At this point, interface list manipulations are fine * At this point, interface list manipulations are fine
......
...@@ -141,7 +141,6 @@ struct ieee80211_txrx_data { ...@@ -141,7 +141,6 @@ struct ieee80211_txrx_data {
* when using CTS protection with IEEE 802.11g. */ * when using CTS protection with IEEE 802.11g. */
struct ieee80211_rate *last_frag_rate; struct ieee80211_rate *last_frag_rate;
int last_frag_hwrate; int last_frag_hwrate;
int mgmt_interface;
/* Extra fragments (in addition to the first fragment /* Extra fragments (in addition to the first fragment
* in skb) */ * in skb) */
...@@ -163,7 +162,6 @@ struct ieee80211_txrx_data { ...@@ -163,7 +162,6 @@ struct ieee80211_txrx_data {
#define IEEE80211_TXPD_REQ_TX_STATUS BIT(0) #define IEEE80211_TXPD_REQ_TX_STATUS BIT(0)
#define IEEE80211_TXPD_DO_NOT_ENCRYPT BIT(1) #define IEEE80211_TXPD_DO_NOT_ENCRYPT BIT(1)
#define IEEE80211_TXPD_REQUEUE BIT(2) #define IEEE80211_TXPD_REQUEUE BIT(2)
#define IEEE80211_TXPD_MGMT_IFACE BIT(3)
/* Stored in sk_buff->cb */ /* Stored in sk_buff->cb */
struct ieee80211_tx_packet_data { struct ieee80211_tx_packet_data {
int ifindex; int ifindex;
...@@ -408,7 +406,6 @@ struct ieee80211_local { ...@@ -408,7 +406,6 @@ struct ieee80211_local {
struct list_head modes_list; struct list_head modes_list;
struct net_device *mdev; /* wmaster# - "master" 802.11 device */ struct net_device *mdev; /* wmaster# - "master" 802.11 device */
struct net_device *apdev; /* wlan#ap - management frames (hostapd) */
int open_count; int open_count;
int monitors; int monitors;
unsigned int filter_flags; /* FIF_* */ unsigned int filter_flags; /* FIF_* */
...@@ -704,14 +701,11 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr) ...@@ -704,14 +701,11 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
int ieee80211_hw_config(struct ieee80211_local *local); int ieee80211_hw_config(struct ieee80211_local *local);
int ieee80211_if_config(struct net_device *dev); int ieee80211_if_config(struct net_device *dev);
int ieee80211_if_config_beacon(struct net_device *dev); int ieee80211_if_config_beacon(struct net_device *dev);
void ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb,
struct ieee80211_rx_status *status, u32 msg_type);
void ieee80211_prepare_rates(struct ieee80211_local *local, void ieee80211_prepare_rates(struct ieee80211_local *local,
struct ieee80211_hw_mode *mode); struct ieee80211_hw_mode *mode);
void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx); void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx);
int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr); int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr);
void ieee80211_if_setup(struct net_device *dev); void ieee80211_if_setup(struct net_device *dev);
void ieee80211_if_mgmt_setup(struct net_device *dev);
struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local, struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local,
int phymode, int hwrate); int phymode, int hwrate);
...@@ -778,8 +772,6 @@ void __ieee80211_if_del(struct ieee80211_local *local, ...@@ -778,8 +772,6 @@ void __ieee80211_if_del(struct ieee80211_local *local,
int ieee80211_if_remove(struct net_device *dev, const char *name, int id); int ieee80211_if_remove(struct net_device *dev, const char *name, int id);
void ieee80211_if_free(struct net_device *dev); void ieee80211_if_free(struct net_device *dev);
void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata); void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata);
int ieee80211_if_add_mgmt(struct ieee80211_local *local);
void ieee80211_if_del_mgmt(struct ieee80211_local *local);
/* regdomain.c */ /* regdomain.c */
void ieee80211_regdomain_init(void); void ieee80211_regdomain_init(void);
...@@ -796,7 +788,6 @@ void ieee80211_tx_pending(unsigned long data); ...@@ -796,7 +788,6 @@ void ieee80211_tx_pending(unsigned long data);
int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev); int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev);
int ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); int ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev);
int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev); int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev);
int ieee80211_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev);
/* utility functions/constants */ /* utility functions/constants */
extern void *mac80211_wiphy_privid; /* for wiphy privid */ extern void *mac80211_wiphy_privid; /* for wiphy privid */
......
...@@ -96,66 +96,6 @@ fail: ...@@ -96,66 +96,6 @@ fail:
return ret; return ret;
} }
int ieee80211_if_add_mgmt(struct ieee80211_local *local)
{
struct net_device *ndev;
struct ieee80211_sub_if_data *nsdata;
int ret;
ASSERT_RTNL();
ndev = alloc_netdev(sizeof(struct ieee80211_sub_if_data), "wmgmt%d",
ieee80211_if_mgmt_setup);
if (!ndev)
return -ENOMEM;
ret = dev_alloc_name(ndev, ndev->name);
if (ret < 0)
goto fail;
memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
nsdata = IEEE80211_DEV_TO_SUB_IF(ndev);
ndev->ieee80211_ptr = &nsdata->wdev;
nsdata->wdev.wiphy = local->hw.wiphy;
nsdata->type = IEEE80211_IF_TYPE_MGMT;
nsdata->dev = ndev;
nsdata->local = local;
ieee80211_if_sdata_init(nsdata);
ret = register_netdevice(ndev);
if (ret)
goto fail;
/*
* Called even when register_netdevice fails, it would
* oops if assigned before initialising the rest.
*/
ndev->uninit = ieee80211_if_reinit;
ieee80211_debugfs_add_netdev(nsdata);
if (local->open_count > 0)
dev_open(ndev);
local->apdev = ndev;
return 0;
fail:
free_netdev(ndev);
return ret;
}
void ieee80211_if_del_mgmt(struct ieee80211_local *local)
{
struct net_device *apdev;
ASSERT_RTNL();
apdev = local->apdev;
ieee80211_debugfs_remove_netdev(IEEE80211_DEV_TO_SUB_IF(apdev));
local->apdev = NULL;
unregister_netdevice(apdev);
}
void ieee80211_if_set_type(struct net_device *dev, int type) void ieee80211_if_set_type(struct net_device *dev, int type)
{ {
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
...@@ -247,9 +187,6 @@ void ieee80211_if_reinit(struct net_device *dev) ...@@ -247,9 +187,6 @@ void ieee80211_if_reinit(struct net_device *dev)
/* cannot happen */ /* cannot happen */
WARN_ON(1); WARN_ON(1);
break; break;
case IEEE80211_IF_TYPE_MGMT:
/* nothing to do */
break;
case IEEE80211_IF_TYPE_AP: { case IEEE80211_IF_TYPE_AP: {
/* Remove all virtual interfaces that use this BSS /* Remove all virtual interfaces that use this BSS
* as their sdata->bss */ * as their sdata->bss */
...@@ -357,11 +294,8 @@ int ieee80211_if_remove(struct net_device *dev, const char *name, int id) ...@@ -357,11 +294,8 @@ int ieee80211_if_remove(struct net_device *dev, const char *name, int id)
void ieee80211_if_free(struct net_device *dev) void ieee80211_if_free(struct net_device *dev)
{ {
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
/* local->apdev must be NULL when freeing management interface */
BUG_ON(dev == local->apdev);
ieee80211_if_sdata_deinit(sdata); ieee80211_if_sdata_deinit(sdata);
free_netdev(dev); free_netdev(dev);
} }
...@@ -145,8 +145,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, ...@@ -145,8 +145,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
struct rate_control_ref *ref, *old; struct rate_control_ref *ref, *old;
ASSERT_RTNL(); ASSERT_RTNL();
if (local->open_count || netif_running(local->mdev) || if (local->open_count || netif_running(local->mdev))
(local->apdev && netif_running(local->apdev)))
return -EBUSY; return -EBUSY;
ref = rate_control_alloc(name, local); ref = rate_control_alloc(name, local);
......
...@@ -30,8 +30,6 @@ struct rate_control_extra { ...@@ -30,8 +30,6 @@ struct rate_control_extra {
/* parameters from the caller to rate_control_get_rate(): */ /* parameters from the caller to rate_control_get_rate(): */
struct ieee80211_hw_mode *mode; struct ieee80211_hw_mode *mode;
int mgmt_data; /* this is data frame that is used for management
* (e.g., IEEE 802.1X EAPOL) */
u16 ethertype; u16 ethertype;
}; };
......
...@@ -473,8 +473,6 @@ static void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb, ...@@ -473,8 +473,6 @@ static void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb,
pkt_data = (struct ieee80211_tx_packet_data *) skb->cb; pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data)); memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
pkt_data->ifindex = sdata->dev->ifindex; pkt_data->ifindex = sdata->dev->ifindex;
if (sdata->type == IEEE80211_IF_TYPE_MGMT)
pkt_data->flags |= IEEE80211_TXPD_MGMT_IFACE;
if (!encrypt) if (!encrypt)
pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT; pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "ieee80211_i.h" #include "ieee80211_i.h"
#include "ieee80211_led.h" #include "ieee80211_led.h"
#include "ieee80211_common.h"
#include "wep.h" #include "wep.h"
#include "wpa.h" #include "wpa.h"
#include "tkip.h" #include "tkip.h"
...@@ -412,12 +411,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx) ...@@ -412,12 +411,7 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
return TXRX_DROP; return TXRX_DROP;
} }
if (!rx->local->apdev) return TXRX_DROP;
return TXRX_DROP;
ieee80211_rx_mgmt(rx->local, rx->skb, rx->u.rx.status,
ieee80211_msg_sta_not_assoc);
return TXRX_QUEUED;
} }
return TXRX_CONTINUE; return TXRX_CONTINUE;
...@@ -983,15 +977,8 @@ ieee80211_rx_h_802_1x_pae(struct ieee80211_txrx_data *rx) ...@@ -983,15 +977,8 @@ ieee80211_rx_h_802_1x_pae(struct ieee80211_txrx_data *rx)
{ {
if (rx->sdata->eapol && ieee80211_is_eapol(rx->skb) && if (rx->sdata->eapol && ieee80211_is_eapol(rx->skb) &&
rx->sdata->type != IEEE80211_IF_TYPE_STA && rx->sdata->type != IEEE80211_IF_TYPE_STA &&
(rx->flags & IEEE80211_TXRXD_RXRA_MATCH)) { (rx->flags & IEEE80211_TXRXD_RXRA_MATCH))
/* Pass both encrypted and unencrypted EAPOL frames to user return TXRX_CONTINUE;
* space for processing. */
if (!rx->local->apdev)
return TXRX_DROP;
ieee80211_rx_mgmt(rx->local, rx->skb, rx->u.rx.status,
ieee80211_msg_normal);
return TXRX_QUEUED;
}
if (unlikely(rx->sdata->ieee802_1x && if (unlikely(rx->sdata->ieee802_1x &&
(rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA && (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
...@@ -1233,15 +1220,11 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx) ...@@ -1233,15 +1220,11 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev); sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
if ((sdata->type == IEEE80211_IF_TYPE_STA || if ((sdata->type == IEEE80211_IF_TYPE_STA ||
sdata->type == IEEE80211_IF_TYPE_IBSS) && sdata->type == IEEE80211_IF_TYPE_IBSS) &&
!rx->local->user_space_mlme) { !rx->local->user_space_mlme)
ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status); ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status);
} else { else
/* Management frames are sent to hostapd for processing */ return TXRX_DROP;
if (!rx->local->apdev)