From 97e97d53f720842db2cc8c6d1cd6b53147a5c298 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 11 Oct 2011 15:33:10 -0400
Subject: [PATCH] --- yaml --- r: 266655 b: refs/heads/master c:
 5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2 h: refs/heads/master i:   266653:
 b93bec4156c6bad78089e5275a2df39b6eec3760   266651:
 10a2cd372c9855a8e2518f4c4aabf575315cb66e   266647:
 deddf2418dd943df8c636cee0b8ce76132363833   266639:
 3045fedc4a07512a37e38c574d05c8b63ba48a0f   266623:
 ec94e2ffc6606919a2e439ee7f36d1cb8105f884 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d958ae1e5a98..fb6ad5308d97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6222fb0d669307a49e2a96aad86c156a9bb9551
+refs/heads/master: 5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 8d9fbd4a62b7..3aff36bad5d3 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -1732,7 +1732,7 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
 			  struct ieee80211_channel *chan, bool offchan,
 			  enum nl80211_channel_type channel_type,
 			  bool channel_type_valid, unsigned int wait,
-			  const u8 *buf, size_t len, u64 *cookie)
+			  const u8 *buf, size_t len, bool no_cck, u64 *cookie)
 {
 	struct ath6kl *ar = ath6kl_priv(dev);
 	u32 id;