From c9a71581c154b30c5c373778bace62c79a1b6a8b Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Wed, 24 Nov 2010 14:34:41 +0900
Subject: [PATCH] --- yaml --- r: 224692 b: refs/heads/master c:
 79b1c460a0b55e55981c25c56597c4d5d2872de3 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/mac80211.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 11489038f120..8799db69b3b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48124d1a91fb77defc9734b4556350d59671fb2c
+refs/heads/master: 79b1c460a0b55e55981c25c56597c4d5d2872de3
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 08e97e5d03fd..eaa4affd40cd 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -1745,6 +1745,13 @@ enum ieee80211_ampdu_mlme_action {
  *	completion of the channel switch.
  *
  * @napi_poll: Poll Rx queue for incoming data frames.
+ *
+ * @set_antenna: Set antenna configuration (tx_ant, rx_ant) on the device.
+ *	Parameters are bitmaps of allowed antennas to use for TX/RX. Drivers may
+ *	reject TX/RX mask combinations they cannot support by returning -EINVAL
+ *	(also see nl80211.h @NL80211_ATTR_WIPHY_ANTENNA_TX).
+ *
+ * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant).
  */
 struct ieee80211_ops {
 	int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);