Merge remote branch 'wireless-next/master' into ath6kl-next

[~andy/linux] / drivers / net / wireless / ath / ath6kl / main.c

diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 45621baca24a68b317e35fafbdb1339907dba137..c189e28e86a9bbfaebb7f81a32291801d51fa1f7 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -602,7 +602,6 @@ static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel)
 
        struct ath6kl *ar = vif->ar;
 
-       vif->next_chan = channel;
        vif->profile.ch = cpu_to_le16(channel);
 
        switch (vif->nw_type) {