Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / rtl8187.h

diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
index 1b0d750f662383176a31a1e674b539ed05441584..e82bb4d289e834e2a2117a463d1a96697534a47d 100644 (file)
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -58,12 +58,6 @@ struct rtl8187b_rx_hdr {
 
 /* {rtl8187,rtl8187b}_tx_info is in skb */
 
-/* Tx flags are common between rtl8187 and rtl8187b */
-#define RTL8187_TX_FLAG_NO_ENCRYPT     (1 << 15)
-#define RTL8187_TX_FLAG_MORE_FRAG      (1 << 17)
-#define RTL8187_TX_FLAG_CTS            (1 << 18)
-#define RTL8187_TX_FLAG_RTS            (1 << 23)
-
 struct rtl8187_tx_hdr {
        __le32 flags;
        __le16 rts_duration;
@@ -94,6 +88,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];