bcm43xx-d80211: rewrite interface handling
Subsystems (3)
PATCH 1/1 bcm43xx-d80211: rewrite interface handling
Hi John,
Please apply to wireless-dev.
--
Rewrite the virtual interface handling.
With this monitor_during_oper is made possible.
Signed-off-by Michael Buesch <[email protected]>
drivers/net/wireless/d80211/bcm43xx/bcm43xx.h +39 -3
@@ -626,10 +626,32 @@u8 algorithm; }; +struct bcm43xx_interface { +/* Opaque ID of the operating interface (!= monitor +* interface) from the ieee80211 subsystem. +* Do not modify. +*/ +int if_id; +/* MAC address. */ +u8 *mac_addr; +/* Current BSSID (if any). */ +u8 *bssid; + +/* Interface type. (IEEE80211_IF_TYPE_XXX) */ +int type; +/* Counter of active monitor interfaces. */ +int monitor; +/* Is the card operating in AP, STA or IBSS mode? */ +unsigned int operating:1 ; +/* Promisc mode active? +* Note that (monitor != 0) implies promisc. +*/ +unsigned int promisc:1 ; +}; +struct bcm43xx_private {struct ieee80211_hw *ieee;struct ieee80211_low_level_stats ieee_stats; -int iw_mode;struct net_device *net_dev;struct pci_dev *pci_dev;
@@ -653,6 +675,13 @@ short_slot:1 ,/* TRUE, if short slot timing is enabled. */ firmware_norelease:1; /* Do not release the firmware. Used on suspend. */ +/* One physical device can have one operating interface +* and a virtually infinite amount of monitoring interfaces. +* This keeps track of the interfaces and the corresponding +* hardware modes. +*/ +struct bcm43xx_interface interface; +/* Various statistics about the physical device. */ struct bcm43xx_stats stats;/* Bus type we are connected to.
@@ -716,8 +745,6 @@/* Informational stuff. */ char nick[IW_ESSID_MAX_SIZE +1 ]; -u8 bssid[ETH_ALEN ]; -int interfaces;/* encryption/decryption */ u16 security_offset;
@@ -854,6 +881,15 @@return bcm; } +/* Is the device operating in a specified mode (IEEE80211_IF_TYPE_XXX). */ +static inline +int bcm43xx_is_mode (struct bcm43xx_private *bcm,int type) +{ +if (type ==IEEE80211_IF_TYPE_MNTR ) +return !!bcm->interface.monitor; +return (bcm->interface.operating && + bcm->interface.type == type); +}static inline u16 bcm43xx_read16 (struct bcm43xx_private *bcm,u16 offset)
drivers/net/wireless/d80211/bcm43xx/bcm43xx_leds.c +1 -1
@@ -217,7 +217,7 @@bcm43xx_led_blink_stop (led,0 );continue ;case BCM43xx_LED_APTRANSFER: -if (bcm->iw_mode ==IW_MODE_MASTER ) { +if (bcm43xx_is_mode (bcm,IEEE80211_IF_TYPE_AP )) {if (transferring) { interval = BCM43xx_LEDBLINK_FAST; turn_on =1 ;
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +126 -88
334 lines not on this page · raw message
drivers/net/wireless/d80211/bcm43xx/bcm43xx_phy.c +2 -2
@@ -94,7 +94,7 @@bcm43xx_mac_suspend (bcm);spin_lock (&phy->lock); }else { -if (bcm->iw_mode !=IW_MODE_MASTER ) +if (!bcm43xx_is_mode (bcm,IEEE80211_IF_TYPE_AP ))bcm43xx_power_saving_ctl_bits (bcm,-1 ,1 ); } phy->is_locked =1 ;
@@ -111,7 +111,7 @@bcm43xx_mac_enable (bcm); } }else { -if (bcm->iw_mode !=IW_MODE_MASTER ) +if (!bcm43xx_is_mode (bcm,IEEE80211_IF_TYPE_AP ))bcm43xx_power_saving_ctl_bits (bcm,-1 ,-1 ); } phy->is_locked =0 ;
Signature · 1 line
Greetings Michael.
Quoted 4 lines · Michael Buesch
Rewrite the virtual interface handling.
With thismonitor_during_operis made possible.Signed-off-by Michael Buesch <[email protected]>
Acked-by Jiri Benc <[email protected]>
Signature · 2 lines
Jiri Benc SUSE Labs