aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl8187.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-01 22:08:51 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-01 22:08:51 -0700
commite9e80ea5f2129e135e3a6fa260314b1c6d99b19a (patch)
treedb20dc85b0e620ea3fcaf86a9026d6df7cb2e168 /drivers/net/wireless/rtl8187.h
parent2b12a4c524812fb3f6ee590a02e65b95c8c32229 (diff)
parent56decd3c5758b0d776c073f65f777beb7a05ac0a (diff)
downloadkernel_samsung_smdk4412-e9e80ea5f2129e135e3a6fa260314b1c6d99b19a.zip
kernel_samsung_smdk4412-e9e80ea5f2129e135e3a6fa260314b1c6d99b19a.tar.gz
kernel_samsung_smdk4412-e9e80ea5f2129e135e3a6fa260314b1c6d99b19a.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rtl8187.h')
-rw-r--r--drivers/net/wireless/rtl8187.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
index 1b0d750..5a9515c 100644
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -94,6 +94,10 @@ struct rtl8187_priv {
const struct rtl818x_rf_ops *rf;
struct ieee80211_vif *vif;
int mode;
+ /* The mutex protects the TX loopback state.
+ * Any attempt to set channels concurrently locks the device.
+ */
+ struct mutex conf_mutex;
/* rtl8187 specific */
struct ieee80211_channel channels[14];