Merge commit 'v2.6.28-rc2' into core/locking

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

diff --git a/include/net/wireless.h b/include/net/wireless.h
index 0de7fde9f336870983ef42ae151512dc2ddaf80e..721efb363db73cd0bb06270e5c1463a6e7ffe930 100644 (file)
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -223,9 +223,11 @@ struct wiphy {
  * the netdev.)
  *
  * @wiphy: pointer to hardware description
+ * @iftype: interface type
  */
 struct wireless_dev {
        struct wiphy *wiphy;
+       enum nl80211_iftype iftype;
 
        /* private to the generic wireless code */
        struct list_head list;