diff options
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
-rw-r--r-- | drivers/net/wireless/b43/b43.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index a22435ade8ca..2c8fa1c3465e 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h | |||
@@ -604,9 +604,8 @@ struct b43_wl { | |||
604 | * at a time. General information about this interface follows. | 604 | * at a time. General information about this interface follows. |
605 | */ | 605 | */ |
606 | 606 | ||
607 | /* Opaque ID of the operating interface (!= monitor | 607 | /* Opaque ID of the operating interface from the ieee80211 |
608 | * interface) from the ieee80211 subsystem. | 608 | * subsystem. Do not modify. |
609 | * Do not modify. | ||
610 | */ | 609 | */ |
611 | int if_id; | 610 | int if_id; |
612 | /* The MAC address of the operating interface. */ | 611 | /* The MAC address of the operating interface. */ |
@@ -615,14 +614,10 @@ struct b43_wl { | |||
615 | u8 bssid[ETH_ALEN]; | 614 | u8 bssid[ETH_ALEN]; |
616 | /* Interface type. (IEEE80211_IF_TYPE_XXX) */ | 615 | /* Interface type. (IEEE80211_IF_TYPE_XXX) */ |
617 | int if_type; | 616 | int if_type; |
618 | /* Counter of active monitor interfaces. */ | ||
619 | int monitor; | ||
620 | /* Is the card operating in AP, STA or IBSS mode? */ | 617 | /* Is the card operating in AP, STA or IBSS mode? */ |
621 | bool operating; | 618 | bool operating; |
622 | /* Promisc mode active? | 619 | /* filter flags */ |
623 | * Note that (monitor != 0) implies promisc. | 620 | unsigned int filter_flags; |
624 | */ | ||
625 | bool promisc; | ||
626 | /* Stats about the wireless interface */ | 621 | /* Stats about the wireless interface */ |
627 | struct ieee80211_low_level_stats ieee_stats; | 622 | struct ieee80211_low_level_stats ieee_stats; |
628 | 623 | ||
@@ -779,8 +774,6 @@ static inline struct b43_wldev *dev_to_b43_wldev(struct device *dev) | |||
779 | /* Is the device operating in a specified mode (IEEE80211_IF_TYPE_XXX). */ | 774 | /* Is the device operating in a specified mode (IEEE80211_IF_TYPE_XXX). */ |
780 | static inline int b43_is_mode(struct b43_wl *wl, int type) | 775 | static inline int b43_is_mode(struct b43_wl *wl, int type) |
781 | { | 776 | { |
782 | if (type == IEEE80211_IF_TYPE_MNTR) | ||
783 | return !!(wl->monitor); | ||
784 | return (wl->operating && wl->if_type == type); | 777 | return (wl->operating && wl->if_type == type); |
785 | } | 778 | } |
786 | 779 | ||