AP mode is coming
Subsystems (2)
Johannes Berg
maintainerPATCH 3/8 nl80211: Add monitor interface configuration flags
In reply to Johannes BergFrom: Michael Wu <[email protected]>
This allows precise control over what a monitor interface shows.
---
include/linux/nl80211.h | 35 +++++++++++++++++++++++++++++++++++ include/net/cfg80211.h | 24 ++++++++++++++++++++++-- net/mac80211/cfg.c | 4 ++-- net/wireless/nl80211.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 101 insertions(+), 6 deletions(-)
include/linux/nl80211.h +35 -0
@@ -164,6 +164,9 @@ enum nl80211_commands {* @NL80211_ATTR_WIPHY_BANDS: Information about an operating bands, * consisting of a nested array. * +* @NL80211_ATTR_MNTR_FLAGS: flags, nested element with NLA_FLAG attributes of +* &enum nl80211_mntr_flags. +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -200,6 +203,8 @@ enum nl80211_attrs {NL80211_ATTR_WIPHY_BANDS , +NL80211_ATTR_MNTR_FLAGS , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -344,4 +349,34 @@ enum nl80211_bitrate_attr {NL80211_BITRATE_ATTR_MAX = __NL80211_BITRATE_ATTR_AFTER_LAST -1 }; +/** +* enum nl80211_mntr_flags - monitor configuration flags +* +* Monitor configuration flags. +* +* @__NL80211_MNTR_FLAG_INVALID: reserved +* +* @NL80211_MNTR_FLAG_FCSFAIL: pass frames with bad FCS +* @NL80211_MNTR_FLAG_PLCPFAIL: pass frames with bad PLCP +* @NL80211_MNTR_FLAG_CONTROL: pass control frames +* @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering +* @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing. +* overrides all other flags. +* +* @__NL80211_MNTR_FLAG_AFTER_LAST: internal use +* @NL80211_MNTR_FLAG_MAX: highest possible monitor flag +*/ +enum nl80211_mntr_flags { + __NL80211_MNTR_FLAG_INVALID, +NL80211_MNTR_FLAG_FCSFAIL , +NL80211_MNTR_FLAG_PLCPFAIL , +NL80211_MNTR_FLAG_CONTROL , +NL80211_MNTR_FLAG_OTHER_BSS , +NL80211_MNTR_FLAG_COOK_FRAMES , + +/* keep last */ + __NL80211_MNTR_FLAG_AFTER_LAST, +NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST -1 +}; +#endif /* __LINUX_NL80211_H */
include/net/cfg80211.h +22 -2
@@ -163,6 +163,26 @@ struct station_stats {u32 tx_bytes; }; +/** +* enum monitor_flags - monitor flags +* +* Monitor interface configuration flags. Note that these must be the bits +* according to the nl80211 flags. +* +* @MONITOR_FLAG_FCSFAIL: pass frames with bad FCS +* @MONITOR_FLAG_PLCPFAIL: pass frames with bad PLCP +* @MONITOR_FLAG_CONTROL: pass control frames +* @MONITOR_FLAG_OTHER_BSS: disable BSSID filtering +* @MONITOR_FLAG_COOK_FRAMES: report frames after processing +*/ +enum monitor_flags { +MONITOR_FLAG_FCSFAIL =1 <<NL80211_MNTR_FLAG_FCSFAIL , +MONITOR_FLAG_PLCPFAIL =1 <<NL80211_MNTR_FLAG_PLCPFAIL , +MONITOR_FLAG_CONTROL =1 <<NL80211_MNTR_FLAG_CONTROL , +MONITOR_FLAG_OTHER_BSS =1 <<NL80211_MNTR_FLAG_OTHER_BSS , +MONITOR_FLAG_COOK_FRAMES =1 <<NL80211_MNTR_FLAG_COOK_FRAMES , +}; +/* from net/wireless.h */ struct wiphy ;
@@ -213,10 +233,10 @@ struct wiphy;*/ struct cfg80211_ops {int (*add_virtual_intf)(struct wiphy *wiphy,char *name, -enum nl80211_iftype type); +enum nl80211_iftype type,u32 *flags);int (*del_virtual_intf)(struct wiphy *wiphy,int ifindex);int (*change_virtual_intf)(struct wiphy *wiphy,int ifindex, -enum nl80211_iftype type); +enum nl80211_iftype type,u32 *flags); int (*add_key)(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, u8 *mac_addr,
net/mac80211/cfg.c +2 -2
@@ -34,7 +34,7 @@ nl80211_type_to_mac80211_type(enum nl802 }static int ieee80211_add_iface (struct wiphy *wiphy,char *name, -enum nl80211_iftype type) +enum nl80211_iftype type,u32 *flags) {struct ieee80211_local *local =wiphy_priv (wiphy);enum ieee80211_if_types itype;
@@ -69,7 +69,7 @@ static int ieee80211_del_iface(struct wi }static int ieee80211_change_iface (struct wiphy *wiphy,int ifindex, -enum nl80211_iftype type) +enum nl80211_iftype type,u32 *flags) {struct ieee80211_local *local =wiphy_priv (wiphy);struct net_device *dev;
net/wireless/nl80211.c +42 -2
81 lines not on this page · raw message
Johannes Berg
maintainerPATCH 4/8 mac80211: Use monitor configuration flags
In reply to Johannes BergFrom: Michael Wu <[email protected]>
Take advantage of the monitor configuration flags now provided by cfg80211.
---
net/mac80211/cfg.c | 15 ++++++++++ net/mac80211/ieee80211.c | 56 ++++++++++++++++++++++++++++++----------- net/mac80211/ieee80211_i.h | 3 ++ net/mac80211/ieee80211_iface.c | 2 + 4 files changed, 60 insertions(+), 16 deletions(-)
net/mac80211/cfg.c +14 -1
@@ -38,6 +38,9 @@ static int ieee80211_add_iface(struct wi {struct ieee80211_local *local =wiphy_priv (wiphy);enum ieee80211_if_types itype; +struct net_device *dev; +struct ieee80211_sub_if_data *sdata; +int err;if (unlikely (local->reg_state !=IEEE80211_DEV_REGISTERED ))return -ENODEV ;
@@ -46,7 +49,13 @@ static int ieee80211_add_iface(struct wiif (itype ==IEEE80211_IF_TYPE_INVALID )return -EINVAL ; -return ieee80211_if_add (local->mdev, name,NULL , itype); + err =ieee80211_if_add (local->mdev, name, &dev, itype); +if (err || itype !=IEEE80211_IF_TYPE_MNTR || !flags) +return err; + + sdata =IEEE80211_DEV_TO_SUB_IF (dev); + sdata->u.mntr_flags = *flags; +return 0 ; }static int ieee80211_del_iface (struct wiphy *wiphy,int ifindex)
@@ -99,6 +108,10 @@ static int ieee80211_change_iface(structieee80211_if_reinit (dev);ieee80211_if_set_type (dev, itype); +if (sdata->vif.type !=IEEE80211_IF_TYPE_MNTR || !flags) +return 0 ; + + sdata->u.mntr_flags = *flags;return 0 ; }
net/mac80211/ieee80211.c +41 -15
76 lines not on this page · raw message
net/mac80211/ieee80211_i.h +3 -0
@@ -345,6 +345,7 @@ struct ieee80211_sub_if_data {struct ieee80211_if_wds wds;struct ieee80211_if_vlan vlan;struct ieee80211_if_sta sta; +u32 mntr_flags; } u;int channel_use;int channel_use_raw;
@@ -425,6 +426,8 @@ struct ieee80211_local {struct net_device *mdev;/* wmaster# - "master" 802.11 device */ int open_count;int monitors; +/* number of interfaces with corresponding FIF_ flags */ +int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss;unsigned int filter_flags;/* FIF_* */ struct iw_statistics wstats;u8 wstats_flags;
net/mac80211/ieee80211_iface.c +2 -0
@@ -160,6 +160,8 @@ void ieee80211_if_set_type(struct net_decase IEEE80211_IF_TYPE_MNTR : dev->type =ARPHRD_IEEE80211_RADIOTAP ; dev->hard_start_xmit = ieee80211_monitor_start_xmit; + sdata->u.mntr_flags =MONITOR_FLAG_CONTROL | +MONITOR_FLAG_OTHER_BSS ;break ;default : printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x",
Johannes Berg
maintainerPATCH 1/8 mac80211: split ieee80211_txrx_result
In reply to Johannes BergThe _DROP result will need to be split in the RX path but not in the TX path, so for preparation split up the type into two types, one for RX and one for TX. Also make sure (via sparse) that they cannot be confused.
---
Not entirely sure about the __bitwise__ stuff, should we do that?
net/mac80211/ieee80211_i.h | 23 ++++-- net/mac80211/ieee80211_sta.c | 14 ++-- net/mac80211/rx.c | 150 +++++++++++++++++++++---------------------- net/mac80211/tx.c | 110 +++++++++++++++---------------- net/mac80211/wep.c | 16 ++-- net/mac80211/wep.h | 4 - net/mac80211/wpa.c | 72 ++++++++++---------- net/mac80211/wpa.h | 12 +-- 8 files changed, 204 insertions(+), 197 deletions(-)
net/mac80211/ieee80211_i.h +15 -8
@@ -108,9 +108,16 @@ struct ieee80211_sta_bss { }; -typedef enum { -TXRX_CONTINUE ,TXRX_DROP ,TXRX_QUEUED -}ieee80211_txrx_result ; +typedef unsigned __bitwise__ ieee80211_tx_result ; +#define TX_CONTINUE ((__force ieee80211_tx_result) 0u) +#define TX_DROP ((__force ieee80211_tx_result) 1u) +#define TX_QUEUED ((__force ieee80211_tx_result) 2u) + +typedef unsigned __bitwise__ ieee80211_rx_result ; +#define RX_CONTINUE ((__force ieee80211_rx_result) 0u) +#define RX_DROP ((__force ieee80211_rx_result) 1u) +#define RX_QUEUED ((__force ieee80211_rx_result) 2u) +/* flags used in struct ieee80211_txrx_data.flags */ /* whether the MSDU was fragmented */
@@ -182,10 +189,10 @@ struct ieee80211_tx_stored_packet {unsigned int last_frag_rate_ctrl_probe; }; -typedef ieee80211_txrx_result (*ieee80211_tx_handler ) +typedef ieee80211_tx_result (*ieee80211_tx_handler ) (struct ieee80211_txrx_data *tx); -typedef ieee80211_txrx_result (*ieee80211_rx_handler ) +typedef ieee80211_rx_result (*ieee80211_rx_handler ) (struct ieee80211_txrx_data *rx);struct beacon_data {
@@ -729,9 +736,9 @@ int ieee80211_sta_req_scan(struct net_devoid ieee80211_sta_req_auth (struct net_device *dev,struct ieee80211_if_sta *ifsta);int ieee80211_sta_scan_results (struct net_device *dev,char *buf,size_t len); -ieee80211_txrx_result ieee80211_sta_rx_scan (struct net_device *dev, -struct sk_buff *skb, -struct ieee80211_rx_status *rx_status); +ieee80211_rx_result ieee80211_sta_rx_scan ( +struct net_device *dev,struct sk_buff *skb, +struct ieee80211_rx_status *rx_status);void ieee80211_rx_bss_list_init (struct net_device *dev);void ieee80211_rx_bss_list_deinit (struct net_device *dev);int ieee80211_sta_set_extra_ie (struct net_device *dev,char *ie,size_t len);
net/mac80211/wep.h +2 -2
@@ -28,9 +28,9 @@ int ieee80211_wep_decrypt(struct ieee802 struct ieee80211_key *key);u8 *ieee80211_wep_is_weak_iv (struct sk_buff *skb,struct ieee80211_key *key); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_crypto_wep_decrypt (struct ieee80211_txrx_data *rx); -ieee80211_txrx_result +ieee80211_tx_result ieee80211_crypto_wep_encrypt (struct ieee80211_txrx_data *tx);#endif /* WEP_H */
net/mac80211/wpa.h +6 -6
@@ -13,19 +13,19 @@#include <linux/types.h> #include "ieee80211_i.h" -ieee80211_txrx_result +ieee80211_tx_result ieee80211_tx_h_michael_mic_add (struct ieee80211_txrx_data *tx); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_rx_h_michael_mic_verify (struct ieee80211_txrx_data *rx); -ieee80211_txrx_result +ieee80211_tx_result ieee80211_crypto_tkip_encrypt (struct ieee80211_txrx_data *tx); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_crypto_tkip_decrypt (struct ieee80211_txrx_data *rx); -ieee80211_txrx_result +ieee80211_tx_result ieee80211_crypto_ccmp_encrypt (struct ieee80211_txrx_data *tx); -ieee80211_txrx_result +ieee80211_rx_result ieee80211_crypto_ccmp_decrypt (struct ieee80211_txrx_data *rx);#endif /* WPA_H */
net/mac80211/wep.c +8 -8
@@ -305,13 +305,13 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_return NULL ; } -ieee80211_txrx_result +ieee80211_rx_result ieee80211_crypto_wep_decrypt (struct ieee80211_txrx_data *rx) {if ((rx->fc &IEEE80211_FCTL_FTYPE ) !=IEEE80211_FTYPE_DATA && ((rx->fc &IEEE80211_FCTL_FTYPE ) !=IEEE80211_FTYPE_MGMT || (rx->fc &IEEE80211_FCTL_STYPE ) !=IEEE80211_STYPE_AUTH )) -return TXRX_CONTINUE ; +return RX_CONTINUE ;if (!(rx->u.rx.status->flag &RX_FLAG_DECRYPTED )) {if (ieee80211_wep_decrypt (rx->local, rx->skb, rx->key)) {
@@ -320,7 +320,7 @@ ieee80211_crypto_wep_decrypt(struct ieeeprintk (KERN_DEBUG "%s: RX WEP frame, decrypt " "failed\n" , rx->dev->name);#endif /* CONFIG_MAC80211_DEBUG */ -return TXRX_DROP ; +return RX_DROP ; } }else if (!(rx->u.rx.status->flag &RX_FLAG_IV_STRIPPED )) {ieee80211_wep_remove_iv (rx->local, rx->skb, rx->key);
@@ -328,7 +328,7 @@ ieee80211_crypto_wep_decrypt(struct ieeeskb_trim (rx->skb, rx->skb->len -4 ); } -return TXRX_CONTINUE ; +return RX_CONTINUE ; }static int wep_encrypt_skb (struct ieee80211_txrx_data *tx,struct sk_buff *skb)
@@ -346,7 +346,7 @@ static int wep_encrypt_skb(struct ieee80return 0 ; } -ieee80211_txrx_result +ieee80211_tx_result ieee80211_crypto_wep_encrypt (struct ieee80211_txrx_data *tx) { tx->u.tx.control->iv_len =WEP_IV_LEN ;
@@ -355,7 +355,7 @@ ieee80211_crypto_wep_encrypt(struct ieeeif (wep_encrypt_skb (tx, tx->skb) <0 ) {I802_DEBUG_INC (tx->local->tx_handlers_drop_wep); -return TXRX_DROP ; +return TX_DROP ; }if (tx->u.tx.extra_frag) {
@@ -364,10 +364,10 @@ ieee80211_crypto_wep_encrypt(struct ieeeif (wep_encrypt_skb (tx, tx->u.tx.extra_frag[i]) <0 ) {I802_DEBUG_INC (tx->local-> tx_handlers_drop_wep); -return TXRX_DROP ; +return TX_DROP ; } } } -return TXRX_CONTINUE ; +return TX_CONTINUE ; }
net/mac80211/ieee80211_sta.c +7 -7
@@ -2558,7 +2558,7 @@ static void ieee80211_sta_rx_queued_mgmt } -ieee80211_txrx_result +ieee80211_rx_result ieee80211_sta_rx_scan (struct net_device *dev,struct sk_buff *skb,struct ieee80211_rx_status *rx_status) {
@@ -2566,31 +2566,31 @@ ieee80211_sta_rx_scan(struct net_deviceu16 fc;if (skb->len <2 ) -return TXRX_DROP ; +return RX_DROP ; mgmt = (struct ieee80211_mgmt *) skb->data; fc =le16_to_cpu (mgmt->frame_control);if ((fc &IEEE80211_FCTL_FTYPE ) ==IEEE80211_FTYPE_CTL ) -return TXRX_CONTINUE ; +return RX_CONTINUE ;if (skb->len <24 ) -return TXRX_DROP ; +return RX_DROP ;if ((fc &IEEE80211_FCTL_FTYPE ) ==IEEE80211_FTYPE_MGMT ) {if ((fc &IEEE80211_FCTL_STYPE ) ==IEEE80211_STYPE_PROBE_RESP ) {ieee80211_rx_mgmt_probe_resp (dev, mgmt, skb->len, rx_status);dev_kfree_skb (skb); -return TXRX_QUEUED ; +return RX_QUEUED ; }else if ((fc &IEEE80211_FCTL_STYPE ) ==IEEE80211_STYPE_BEACON ) {ieee80211_rx_mgmt_beacon (dev, mgmt, skb->len, rx_status);dev_kfree_skb (skb); -return TXRX_QUEUED ; +return RX_QUEUED ; } } -return TXRX_CONTINUE ; +return RX_CONTINUE ; }
net/mac80211/wpa.c +36 -36
245 lines not on this page · raw message
net/mac80211/rx.c +75 -75
487 lines not on this page · raw message
net/mac80211/tx.c +55 -55
369 lines not on this page · raw message
Johannes Berg
maintainerPATCH 5/8 mac80211: clean up some things in the RX path
In reply to Johannes BergUninline ieee80211_invoke_rx_handlers to save .text space, make the code more readable in some places and remove the "optimisation" that is hit only very few times and unclear to start with.
---
I have a plan to add back such an optimisation but it is rather involved requiring a scan handling change and per-sdata sta structures.
net/mac80211/rx.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-)
net/mac80211/rx.c +10 -27
@@ -1448,11 +1448,10 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrreturn RX_QUEUED ; } -static inline ieee80211_rx_result __ieee80211_invoke_rx_handlers ( -struct ieee80211_local *local, -ieee80211_rx_handler *handlers, -struct ieee80211_txrx_data *rx, -struct sta_info *sta) +static void ieee80211_invoke_rx_handlers (struct ieee80211_local *local, +ieee80211_rx_handler *handlers, +struct ieee80211_txrx_data *rx, +struct sta_info *sta) {ieee80211_rx_handler *handler;ieee80211_rx_result res =RX_DROP_MONITOR ;
@@ -1476,19 +1475,13 @@ static inline ieee80211_rx_result __ieeebreak ; } -if (res ==RX_DROP_UNUSABLE || res ==RX_DROP_MONITOR ) -dev_kfree_skb (rx->skb); -return res; -} - -static inline void ieee80211_invoke_rx_handlers (struct ieee80211_local *local, -ieee80211_rx_handler *handlers, -struct ieee80211_txrx_data *rx, -struct sta_info *sta) -{ -if (__ieee80211_invoke_rx_handlers (local, handlers, rx, sta) == -RX_CONTINUE ) +switch (res) { +case RX_DROP_MONITOR : +case RX_DROP_UNUSABLE : +case RX_CONTINUE :dev_kfree_skb (rx->skb); +break ; + } } static void ieee80211_rx_michael_mic_report(struct net_device *dev,
@@ -1718,16 +1711,6 @@ static void __ieee80211_rx_handle_packet skb = rx.skb; -if (sta && !(sta->flags & (WLAN_STA_WDS |WLAN_STA_ASSOC_AP )) && - !atomic_read (&local->iff_promiscs) && - !is_multicast_ether_addr (hdr->addr1)) { - rx.flags |=IEEE80211_TXRXD_RXRA_MATCH ; -ieee80211_invoke_rx_handlers (local, local->rx_handlers, &rx, - rx.sta); -sta_info_put (sta); -return ; - } -list_for_each_entry_rcu (sdata, &local->interfaces, list) {if (!netif_running (sdata->dev))continue ;
Johannes Berg
maintainerPATCH 8/8 mac80211: Add cooked monitor mode support
In reply to Johannes BergFrom: Michael Wu <[email protected]>
This adds "cooked" monitor mode to mac80211. A monitor interface in "cooked" mode will see all frames that mac80211 has not used internally.
---
net/mac80211/ieee80211.c | 67 +++++++++++++++++++--------------- net/mac80211/ieee80211_i.h | 3 + net/mac80211/rx.c | 87 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 126 insertions(+), 31 deletions(-)
net/mac80211/ieee80211.c +38 -29
@@ -238,6 +238,11 @@ static int ieee80211_open(struct net_dev/* no need to tell driver */ break ;case IEEE80211_IF_TYPE_MNTR : +if (sdata->u.mntr_flags &MONITOR_FLAG_COOK_FRAMES ) { + local->cooked_mntrs++; +break ; + } +/* must be before the call to ieee80211_configure_filter */ local->monitors++;if (local->monitors ==1 )
@@ -367,6 +372,11 @@ static int ieee80211_stop(struct net_dev/* no need to tell driver */ break ;case IEEE80211_IF_TYPE_MNTR : +if (sdata->u.mntr_flags &MONITOR_FLAG_COOK_FRAMES ) { + local->cooked_mntrs--; +break ; + } + local->monitors--;if (local->monitors ==0 ) local->hw.conf.flags &= ~IEEE80211_CONF_RADIOTAP ;
@@ -1174,7 +1184,7 @@ void ieee80211_tx_status(struct ieee8021u16 frag, type;struct ieee80211_tx_status_rtap_hdr *rthdr;struct ieee80211_sub_if_data *sdata; -int monitors; +struct net_device *prev_dev =NULL ;if (!status) { printk(KERN_ERR
@@ -1287,7 +1297,11 @@ void ieee80211_tx_status(struct ieee8021/* this was a transmitted frame, but now we want to reuse it */ skb_orphan (skb); -if (!local->monitors) { +/* +* This is a bit racy but we can avoid a lot of work +* with this test... +*/ +if (!local->monitors && !local->cooked_mntrs) {dev_kfree_skb (skb);return ; }
@@ -1321,42 +1335,37 @@ void ieee80211_tx_status(struct ieee8021 rthdr->data_retries = status->retry_count; +/* XXX: is this sufficient for BPF? */ +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)); +rcu_read_lock (); - monitors = local->monitors;list_for_each_entry_rcu (sdata, &local->interfaces, list) { -/* -* Using the monitors counter is possibly racy, but -* if the value is wrong we simply either clone the skb -* once too much or forget sending it to one monitor iface -* The latter case isn't nice but fixing the race is much -* more complicated. -*/ -if (!monitors || !skb) - goto out; -if (sdata->vif.type ==IEEE80211_IF_TYPE_MNTR ) {if (!netif_running (sdata->dev))continue ; - monitors--; -if (monitors) + +if (prev_dev) { skb2 =skb_clone (skb,GFP_ATOMIC ); -else - skb2 =NULL ; - skb->dev = sdata->dev; -/* XXX: is this sufficient for BPF? */ -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); - skb = skb2; +if (skb2) { + skb2->dev = prev_dev; +netif_rx (skb2); + } + } + + prev_dev = sdata->dev; } } - out: +if (prev_dev) { + skb->dev = prev_dev; +netif_rx (skb); + skb =NULL ; + }rcu_read_unlock (); -if (skb) -dev_kfree_skb (skb); +dev_kfree_skb (skb); }EXPORT_SYMBOL (ieee80211_tx_status);
net/mac80211/ieee80211_i.h +2 -1
@@ -131,6 +131,7 @@ typedef unsigned __bitwise__ ieee80211_r#define IEEE80211_TXRXD_RXRA_MATCH BIT(5)#define IEEE80211_TXRXD_TX_INJECTED BIT(6)#define IEEE80211_TXRXD_RX_AMSDU BIT(7) +#define IEEE80211_TXRXD_RX_CMNTR_REPORTED BIT(8)struct ieee80211_txrx_data {struct sk_buff *skb;struct net_device *dev;
@@ -419,7 +420,7 @@ struct ieee80211_local {struct net_device *mdev;/* wmaster# - "master" 802.11 device */ int open_count; -int monitors; +int monitors, cooked_mntrs;/* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss;unsigned int filter_flags;/* FIF_* */
net/mac80211/rx.c +86 -1
107 lines not on this page · raw message
Johannes Berg
maintainerPATCH 2/8 mac80211: split RX_DROP
In reply to Johannes BergSome instances of RX_DROP mean that the frame was useless, others mean that the frame should be visible in userspace on "cooked" monitor interfaces. This patch splits up RX_DROP and changes each instance appropriately.
--- net/mac80211/ieee80211_i.h | 7 ++--- net/mac80211/ieee80211_sta.c | 4 +- net/mac80211/rx.c | 59 +++++++++++++++++++++---------------------- net/mac80211/wep.c | 2 - net/mac80211/wpa.c | 16 +++++------ 5 files changed, 45 insertions(+), 43 deletions(-)
net/mac80211/ieee80211_i.h +4 -3
@@ -114,9 +114,10 @@ typedef unsigned __bitwise__ ieee80211_t#define TX_QUEUED ((__force ieee80211_tx_result) 2u)typedef unsigned __bitwise__ ieee80211_rx_result ; -#define RX_CONTINUE ((__force ieee80211_rx_result) 0u) -#define RX_DROP ((__force ieee80211_rx_result) 1u) -#define RX_QUEUED ((__force ieee80211_rx_result) 2u) +#define RX_CONTINUE ((__force ieee80211_rx_result) 0u) +#define RX_DROP_UNUSABLE ((__force ieee80211_rx_result) 1u) +#define RX_DROP_MONITOR ((__force ieee80211_rx_result) 2u) +#define RX_QUEUED ((__force ieee80211_rx_result) 3u)/* flags used in struct ieee80211_txrx_data.flags */
net/mac80211/ieee80211_sta.c +2 -2
@@ -2566,7 +2566,7 @@ ieee80211_sta_rx_scan(struct net_deviceu16 fc;if (skb->len <2 ) -return RX_DROP ; +return RX_DROP_UNUSABLE ; mgmt = (struct ieee80211_mgmt *) skb->data; fc =le16_to_cpu (mgmt->frame_control);
@@ -2575,7 +2575,7 @@ ieee80211_sta_rx_scan(struct net_devicereturn RX_CONTINUE ;if (skb->len <24 ) -return RX_DROP ; +return RX_DROP_MONITOR ;if ((fc &IEEE80211_FCTL_FTYPE ) ==IEEE80211_FTYPE_MGMT ) {if ((fc &IEEE80211_FCTL_STYPE ) ==IEEE80211_STYPE_PROBE_RESP ) {
net/mac80211/rx.c +30 -29
222 lines not on this page · raw message
net/mac80211/wep.c +1 -1
@@ -320,7 +320,7 @@ ieee80211_crypto_wep_decrypt(struct ieeeprintk (KERN_DEBUG "%s: RX WEP frame, decrypt " "failed\n" , rx->dev->name);#endif /* CONFIG_MAC80211_DEBUG */ -return RX_DROP ; +return RX_DROP_UNUSABLE ; } }else if (!(rx->u.rx.status->flag &RX_FLAG_IV_STRIPPED )) {ieee80211_wep_remove_iv (rx->local, rx->skb, rx->key);
net/mac80211/wpa.c +8 -8
@@ -148,7 +148,7 @@ ieee80211_rx_h_michael_mic_verify(structif (ieee80211_get_hdr_info (skb, &sa, &da, &qos_tid, &data, &data_len) || data_len <MICHAEL_MIC_LEN ) -return RX_DROP ; +return RX_DROP_UNUSABLE ; data_len -=MICHAEL_MIC_LEN ;
@@ -162,14 +162,14 @@ ieee80211_rx_h_michael_mic_verify(structmichael_mic (key, da, sa, qos_tid &0x0f , data, data_len, mic);if (memcmp (mic, data + data_len,MICHAEL_MIC_LEN ) !=0 || wpa_test) {if (!(rx->flags &IEEE80211_TXRXD_RXRA_MATCH )) -return RX_DROP ; +return RX_DROP_UNUSABLE ;printk (KERN_DEBUG "%s: invalid Michael MIC in data frame from " "%s\n" , rx->dev->name,print_mac (mac, sa));mac80211_ev_michael_mic_failure (rx->dev, rx->key->conf.keyidx, (void *) skb->data); -return RX_DROP ; +return RX_DROP_UNUSABLE ; }/* remove Michael MIC from payload */
@@ -293,7 +293,7 @@ ieee80211_crypto_tkip_decrypt(struct ieereturn RX_CONTINUE ;if (!rx->sta || skb->len - hdrlen <12 ) -return RX_DROP ; +return RX_DROP_UNUSABLE ;if (rx->u.rx.status->flag &RX_FLAG_DECRYPTED ) {if (rx->u.rx.status->flag &RX_FLAG_IV_STRIPPED ) {
@@ -322,7 +322,7 @@ ieee80211_crypto_tkip_decrypt(struct iee"frame from %s (res=%d)\n" , rx->dev->name, print_mac(mac, rx->sta->addr), res);#endif /* CONFIG_MAC80211_DEBUG */ -return RX_DROP ; +return RX_DROP_UNUSABLE ; }/* Trim ICV */
@@ -545,7 +545,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee data_len = skb->len - hdrlen -CCMP_HDR_LEN -CCMP_MIC_LEN ;if (!rx->sta || data_len <0 ) -return RX_DROP ; +return RX_DROP_UNUSABLE ;if ((rx->u.rx.status->flag &RX_FLAG_DECRYPTED ) && (rx->u.rx.status->flag &RX_FLAG_IV_STRIPPED ))
@@ -565,7 +565,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]);#endif /* CONFIG_MAC80211_DEBUG */ key->u.ccmp.replays++; -return RX_DROP ; +return RX_DROP_UNUSABLE ; }if (!(rx->u.rx.status->flag &RX_FLAG_DECRYPTED )) {
@@ -589,7 +589,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee"for RX frame from %s\n" , rx->dev->name, print_mac(mac, rx->sta->addr));#endif /* CONFIG_MAC80211_DEBUG */ -return RX_DROP ; +return RX_DROP_UNUSABLE ; } }
Johannes Berg
maintainercover AP mode is coming
These patches do some cleanups and introduce new features that are the last major features for AP mode. Still missing are many things for basic rate and ERP feature handling, so I'm still holding back the patch that actually enables AP mode---I want the code to be at least mostly 802.11 compliant before I allow that.
johannes
Johannes Berg
maintainerPATCH 6/8 mac80211: remove "dynamic" RX/TX handlers
It doesn't really make sense to have extra pointers to the RX/TX handler arrays instead of just using the arrays directly, that also allows us to make them static.
--- net/mac80211/ieee80211.c | 2 - net/mac80211/ieee80211_i.h | 13 ------- net/mac80211/rx.c | 80 +++++++++++++++++++++------------------------ net/mac80211/tx.c | 9 ++--- 4 files changed, 43 insertions(+), 61 deletions(-)
net/mac80211/ieee80211.c +0 -2
@@ -1426,8 +1426,6 @@ struct ieee80211_hw *ieee80211_alloc_hw( local->hw.queues =1 ;/* default */ local->mdev = mdev; - local->rx_handlers = ieee80211_rx_handlers; - local->tx_handlers = ieee80211_tx_handlers; local->bridge_packets =1 ;
net/mac80211/ieee80211_i.h +0 -13
@@ -190,12 +190,6 @@ struct ieee80211_tx_stored_packet {unsigned int last_frag_rate_ctrl_probe; }; -typedef ieee80211_tx_result (*ieee80211_tx_handler ) -(struct ieee80211_txrx_data *tx); - -typedef ieee80211_rx_result (*ieee80211_rx_handler ) -(struct ieee80211_txrx_data *rx); -struct beacon_data {u8 *head, *tail;int head_len, tail_len;
@@ -477,9 +471,6 @@ struct ieee80211_local {* deliver multicast frames both back to wireless * media and to the local net stack */ -ieee80211_rx_handler *rx_handlers; -ieee80211_tx_handler *tx_handlers; -struct list_head interfaces;bool sta_sw_scanning;
@@ -779,11 +770,7 @@ int ieee80211_if_remove(struct net_devicvoid ieee80211_if_free (struct net_device *dev);void ieee80211_if_sdata_init (struct ieee80211_sub_if_data *sdata); -/* rx handling */ -extern ieee80211_rx_handler ieee80211_rx_handlers[]; -/* tx handling */ -extern ieee80211_tx_handler ieee80211_tx_handlers[];void ieee80211_clear_tx_pending (struct ieee80211_local *local);void ieee80211_tx_pending (unsigned long data);int ieee80211_master_start_xmit (struct sk_buff *skb,struct net_device *dev);
net/mac80211/rx.c +39 -41
110 lines not on this page · raw message
net/mac80211/tx.c +4 -5
@@ -813,10 +813,9 @@ ieee80211_tx_h_load_stats(struct ieee802return TX_CONTINUE ; } -/* TODO: implement register/unregister functions for adding TX/RX handlers -* into ordered list */ -ieee80211_tx_handler ieee80211_tx_handlers[] = +typedef ieee80211_tx_result (*ieee80211_tx_handler )(struct ieee80211_txrx_data *); +static ieee80211_tx_handler ieee80211_tx_handlers[] = { ieee80211_tx_h_check_assoc, ieee80211_tx_h_sequence,
@@ -1158,7 +1157,7 @@ static int ieee80211_tx(struct net_devic sta = tx.sta; tx.u.tx.channel = local->hw.conf.channel; -for (handler = local->tx_handlers; *handler !=NULL ; +for (handler = ieee80211_tx_handlers; *handler !=NULL ; handler++) { res = (*handler)(&tx);if (res !=TX_CONTINUE )
@@ -1914,7 +1913,7 @@ ieee80211_get_buffered_bc(struct ieee802 tx.flags |=IEEE80211_TXRXD_TXPS_BUFFERED ; tx.u.tx.channel = local->hw.conf.channel; -for (handler = local->tx_handlers; *handler !=NULL ; handler++) { +for (handler = ieee80211_tx_handlers; *handler !=NULL ; handler++) { res = (*handler)(&tx);if (res ==TX_DROP || res ==TX_QUEUED )break ;
Johannes Berg
maintainerPATCH 7/8 mac80211: move some code into ieee80211_invoke_rx_handlers
In reply to Johannes BergThere is some duplicated code that sits in front of each function call to ieee80211_invoke_rx_handlers() that can very well be part of that function if it gets slightly different arguments.
--- net/mac80211/rx.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-)
net/mac80211/rx.c +18 -24
@@ -1450,7 +1450,6 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrstatic void ieee80211_rx_michael_mic_report (struct net_device *dev,struct ieee80211_hdr *hdr, -struct sta_info *sta,struct ieee80211_txrx_data *rx) {int keyidx, hdrlen;
@@ -1469,7 +1468,7 @@ static void ieee80211_rx_michael_mic_rep dev->name,print_mac (mac, hdr->addr2), print_mac(mac2, hdr->addr1), keyidx); -if (!sta) { +if (!rx->sta) {/* * Some hardware seem to generate incorrect Michael MIC * reports; ignore them to avoid triggering countermeasures.
@@ -1544,13 +1543,17 @@ static ieee80211_rx_handler ieee80211_rx NULL }; -static void ieee80211_invoke_rx_handlers (struct ieee80211_local *local, +static void ieee80211_invoke_rx_handlers (struct ieee80211_sub_if_data *sdata,struct ieee80211_txrx_data *rx, -struct sta_info *sta) +struct sk_buff *skb) {ieee80211_rx_handler *handler;ieee80211_rx_result res =RX_DROP_MONITOR ; + rx->skb = skb; + rx->sdata = sdata; + rx->dev = sdata->dev; +for (handler = ieee80211_rx_handlers; *handler !=NULL ; handler++) { res = (*handler)(rx);
@@ -1559,12 +1562,12 @@ static void ieee80211_invoke_rx_handlerscontinue ;case RX_DROP_UNUSABLE :case RX_DROP_MONITOR : -I802_DEBUG_INC (local->rx_handlers_drop); -if (sta) - sta->rx_dropped++; +I802_DEBUG_INC (sdata->local->rx_handlers_drop); +if (rx->sta) + rx->sta->rx_dropped++;break ;case RX_QUEUED : -I802_DEBUG_INC (local->rx_handlers_queued); +I802_DEBUG_INC (sdata->local->rx_handlers_queued);break ; }break ;
@@ -1669,7 +1672,6 @@ static void __ieee80211_rx_handle_packet {struct ieee80211_local *local =hw_to_local (hw);struct ieee80211_sub_if_data *sdata; -struct sta_info *sta;struct ieee80211_hdr *hdr;struct ieee80211_txrx_data rx;u16 type;
@@ -1692,14 +1694,14 @@ static void __ieee80211_rx_handle_packetif (type ==IEEE80211_FTYPE_DATA || type ==IEEE80211_FTYPE_MGMT ) local->dot11ReceivedFragmentCount++; - sta = rx.sta =sta_info_get (local, hdr->addr2); -if (sta) { + rx.sta =sta_info_get (local, hdr->addr2); +if (rx.sta) { rx.dev = rx.sta->dev; rx.sdata =IEEE80211_DEV_TO_SUB_IF (rx.dev); }if ((status->flag &RX_FLAG_MMIC_ERROR )) { -ieee80211_rx_michael_mic_report (local->mdev, hdr, sta, &rx); +ieee80211_rx_michael_mic_report (local->mdev, hdr, &rx); goto end; }
@@ -1721,8 +1723,6 @@ static void __ieee80211_rx_handle_packet bssid =ieee80211_get_bssid (hdr, skb->len, sdata->vif.type); rx.flags |=IEEE80211_TXRXD_RXRA_MATCH ; prepares =prepare_for_handlers (sdata, bssid, &rx, hdr); -/* prepare_for_handlers can change sta */ - sta = rx.sta;if (!prepares)continue ;
@@ -1753,24 +1753,18 @@ static void __ieee80211_rx_handle_packetcontinue ; } rx.fc =le16_to_cpu (hdr->frame_control); - rx.skb = skb_new; - rx.dev = prev->dev; - rx.sdata = prev; -ieee80211_invoke_rx_handlers (local, &rx, sta); +ieee80211_invoke_rx_handlers (prev, &rx, skb_new); prev = sdata; }if (prev) { rx.fc =le16_to_cpu (hdr->frame_control); - rx.skb = skb; - rx.dev = prev->dev; - rx.sdata = prev; -ieee80211_invoke_rx_handlers (local, &rx, sta); +ieee80211_invoke_rx_handlers (prev, &rx, skb); }else dev_kfree_skb (skb); end: -if (sta) -sta_info_put (sta); +if (rx.sta) +sta_info_put (rx.sta); }#define SEQ_MODULO 0x1000