[PATCH] mac80211: fix redundant if in transmit path

[PATCH] mac80211: fix redundant if in transmit path

[Simon Wunderlich]

This is already in the right switch branch, no need to check again and
provoke a compiler warning about chanctx_conf might be used
uninitialized.

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
---
 net/mac80211/tx.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d287a4f..ccf0499 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1790,8 +1790,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
 		memcpy(hdr.addr2, sdata->vif.addr, ETH_ALEN);
 		memcpy(hdr.addr3, skb->data + ETH_ALEN, ETH_ALEN);
 		hdrlen = 24;
-		if (sdata->vif.type == NL80211_IFTYPE_AP)
-			chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
+		chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
 		if (!chanctx_conf)
 			goto fail_rcu;
 		band = chanctx_conf->def.chan->band;
-- 
1.7.10.4

Re: [PATCH] mac80211: fix redundant if in transmit path

[Johannes Berg]

On Fri, 2012-11-30 at 20:25 +0100, Simon Wunderlich wrote:
> This is already in the right switch branch, no need to check again and
> provoke a compiler warning about chanctx_conf might be used
> uninitialized.

Nope, look again.

johannes

Re: [PATCH] mac80211: fix redundant if in transmit path

[Simon Wunderlich]

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

On Fri, Nov 30, 2012 at 10:11:53PM +0100, Johannes Berg wrote:
> On Fri, 2012-11-30 at 20:25 +0100, Simon Wunderlich wrote:
> > This is already in the right switch branch, no need to check again and
> > provoke a compiler warning about chanctx_conf might be used
> > uninitialized.
> 
> Nope, look again.

Whoops, you've got me, sorry about that. (still, this compiler warning is annoying)

Cheers,
	Simon


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]