[PATCH 0/2] mac80211: fix a couple of mistakes in CSA code

[PATCH 0/2] mac80211: fix a couple of mistakes in CSA code

[Luca Coelho]

From: Luciano Coelho <luciano.coelho@intel.com>

Hi,

It seems that I made a couple of mistakes when publishing our CSA
patches to the mainline.  These two patches fix these problems.

--
Luca.

Luciano Coelho (2):
  mac80211: fix order of setting ch_switch and drv_pre_channel_switch
    call
  mac80211: add device_timestamp to the drv_pre_channel_switch trace

 net/mac80211/cfg.c   | 12 ++++++------
 net/mac80211/trace.h |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

-- 
2.1.1

[PATCH 1/2] mac80211: fix order of setting ch_switch and drv_pre_channel_switch call

[Luca Coelho]

From: Luciano Coelho <luciano.coelho@intel.com>

There was a mistake when merging commit 6d027bcc (mac80211: add
pre_channel_switch driver operation) for upstream.  The assignment of
the values in the ch_switch structure came below the call to
drv_pre_channel_switch.  Fix the order.

Fixes: 6d027bcc (mac80211: add pre_channel_switch driver operation)
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
---
 net/mac80211/cfg.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c5be146..a43a148 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3158,6 +3158,12 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
 		goto out;
 	}
 
+	ch_switch.timestamp = 0;
+	ch_switch.device_timestamp = 0;
+	ch_switch.block_tx = params->block_tx;
+	ch_switch.chandef = params->chandef;
+	ch_switch.count = params->count;
+
 	err = drv_pre_channel_switch(sdata, &ch_switch);
 	if (err)
 		goto out;
@@ -3175,12 +3181,6 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
 		goto out;
 	}
 
-	ch_switch.timestamp = 0;
-	ch_switch.device_timestamp = 0;
-	ch_switch.block_tx = params->block_tx;
-	ch_switch.chandef = params->chandef;
-	ch_switch.count = params->count;
-
 	err = ieee80211_set_csa_beacon(sdata, params, &changed);
 	if (err) {
 		ieee80211_vif_unreserve_chanctx(sdata);
-- 
2.1.1

[PATCH 2/2] mac80211: add device_timestamp to the drv_pre_channel_switch trace

[Luca Coelho]

From: Luciano Coelho <luciano.coelho@intel.com>

The device_timestamp value was left out of the event trace for
drv_pre_channel_switch by mistake.  Add it.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
---
 net/mac80211/trace.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 809a498..96847e7 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -2140,6 +2140,7 @@ TRACE_EVENT(drv_pre_channel_switch,
 		VIF_ENTRY
 		CHANDEF_ENTRY
 		__field(u64, timestamp)
+		__field(u32, device_timestamp)
 		__field(bool, block_tx)
 		__field(u8, count)
 	),
@@ -2149,6 +2150,7 @@ TRACE_EVENT(drv_pre_channel_switch,
 		VIF_ASSIGN;
 		CHANDEF_ASSIGN(&ch_switch->chandef)
 		__entry->timestamp = ch_switch->timestamp;
+		__entry->device_timestamp = ch_switch->device_timestamp;
 		__entry->block_tx = ch_switch->block_tx;
 		__entry->count = ch_switch->count;
 	),
-- 
2.1.1

Re: [PATCH 0/2] mac80211: fix a couple of mistakes in CSA code

[Johannes Berg]

On Fri, 2014-11-07 at 15:28 +0200, Luca Coelho wrote:
> From: Luciano Coelho <luciano.coelho@intel.com>
> 
> Hi,
> 
> It seems that I made a couple of mistakes when publishing our CSA
> patches to the mainline.  These two patches fix these problems.

Applied.

johannes