[PATCH] mac80211 & drivers: remove IEEE80211_HW_HOST_GEN_BEACON

[PATCH] mac80211 & drivers: remove IEEE80211_HW_HOST_GEN_BEACON

[Johannes Berg]

This flag is unused and not useful either since the driver just calls
ieee80211_beacon_get() if it needs a beacon.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

--- wireless-dev.orig/include/net/mac80211.h	2007-08-15 01:29:23.280200043 +0200
+++ wireless-dev/include/net/mac80211.h	2007-08-15 01:30:32.090200043 +0200
@@ -443,14 +443,13 @@ struct ieee80211_hw {
 
 	/* TODO: frame_type 802.11/802.3, sw_encryption requirements */
 
-	/* Some wireless LAN chipsets generate beacons in the hardware/firmware
-	 * and others rely on host generated beacons. This option is used to
-	 * configure the upper layer IEEE 802.11 module to generate beacons.
-	 * The low-level driver can use ieee80211_beacon_get() to fetch the
-	 * next beacon frame. */
-#define IEEE80211_HW_HOST_GEN_BEACON (1<<0)
+/* hole at 0 */
 
-	/* The device needs to be supplied with a beacon template only. */
+	/*
+	 * The device only needs to be supplied with a beacon template.
+	 * If you need the host to generate each beacon then don't use
+	 * this flag and use ieee80211_beacon_get().
+	 */
 #define IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE (1<<1)
 
 	/* Some devices handle decryption internally and do not
--- wireless-dev.orig/drivers/net/wireless/rt2400pci.c	2007-08-15 01:31:03.400200043 +0200
+++ wireless-dev/drivers/net/wireless/rt2400pci.c	2007-08-15 01:32:17.070200043 +0200
@@ -1444,7 +1444,6 @@ static void rt2400pci_probe_hw_mode(stru
 	 * Initialize all hw fields.
 	 */
 	rt2x00dev->hw->flags =
-	    IEEE80211_HW_HOST_GEN_BEACON |
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
 	    IEEE80211_HW_DATA_NULLFUNC_ACK |
--- wireless-dev.orig/drivers/net/wireless/rt2500pci.c	2007-08-15 01:31:03.500200043 +0200
+++ wireless-dev/drivers/net/wireless/rt2500pci.c	2007-08-15 01:32:20.650200043 +0200
@@ -1689,7 +1689,6 @@ static void rt2500pci_probe_hw_mode(stru
 	 * Initialize all hw fields.
 	 */
 	rt2x00dev->hw->flags =
-	    IEEE80211_HW_HOST_GEN_BEACON |
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
 	    IEEE80211_HW_DATA_NULLFUNC_ACK |
--- wireless-dev.orig/drivers/net/wireless/rt61pci.c	2007-08-15 01:31:03.300200043 +0200
+++ wireless-dev/drivers/net/wireless/rt61pci.c	2007-08-15 01:32:14.390200043 +0200
@@ -2213,7 +2213,6 @@ static void rt61pci_probe_hw_mode(struct
 	 * Initialize all hw fields.
 	 */
 	rt2x00dev->hw->flags =
-	    IEEE80211_HW_HOST_GEN_BEACON |
 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
 	    IEEE80211_HW_WEP_INCLUDE_IV |
 	    IEEE80211_HW_DATA_NULLFUNC_ACK |

Re: [PATCH] mac80211 & drivers: remove IEEE80211_HW_HOST_GEN_BEACON

[Ivo van Doorn]

On Wednesday 15 August 2007, Johannes Berg wrote:
> This flag is unused and not useful either since the driver just calls
> ieee80211_beacon_get() if it needs a beacon.

I assume that mac80211 will always provide a beacon to the driver when needed?
I mean during config_interface a beacon is supplied for master interfaces and this
will kick the beacon handler for rt2x00. (which also assures ieee80211_beacon_get() 
will be called when the beacon has been send).
But for adhoc this will still be properly supplied through rt2x00pci_beacon_update() ?

Ivo

Re: [PATCH] mac80211 & drivers: remove IEEE80211_HW_HOST_GEN_BEACON

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

On Wed, 2007-08-15 at 20:16 +0200, Ivo van Doorn wrote:

> I assume that mac80211 will always provide a beacon to the driver when needed?

Yeah.

> I mean during config_interface a beacon is supplied for master interfaces and this
> will kick the beacon handler for rt2x00. (which also assures ieee80211_beacon_get() 
> will be called when the beacon has been send).
> But for adhoc this will still be properly supplied through rt2x00pci_beacon_update() ?

If it works now it'll continue working since that flag was never
tested :)

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]