Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26

2 files changed, 194 insertions, 51 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index ab4caf63954f..e00750836ba5 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -12,6 +12,16 @@
  * Copyright 2006, 2007 Johannes Berg <johannes@sipsolutions.net>
  */
 
+/**
+ * struct vif_params - describes virtual interface parameters
+ * @mesh_id: mesh ID to use
+ * @mesh_id_len: length of the mesh ID
+ */
+struct vif_params {
+       u8 *mesh_id;
+       int mesh_id_len;
+};
+
 /* Radiotap header iteration
  *   implemented in net/wireless/radiotap.c
  *   docs in Documentation/networking/radiotap-headers.txt
@@ -109,6 +119,19 @@ enum station_flags {
 };
 
 /**
+ * enum plink_action - actions to perform in mesh peers
+ *
+ * @PLINK_ACTION_INVALID: action 0 is reserved
+ * @PLINK_ACTION_OPEN: start mesh peer link establishment
+ * @PLINK_ACTION_BLOCL: block traffic from this mesh peer
+ */
+enum plink_actions {
+        PLINK_ACTION_INVALID,
+        PLINK_ACTION_OPEN,
+        PLINK_ACTION_BLOCK,
+};
+
+/**
  * struct station_parameters - station parameters
  *
  * Used to change and create a new station.
@@ -128,39 +151,52 @@ struct station_parameters {
         int listen_interval;
         u16 aid;
         u8 supported_rates_len;
+        u8 plink_action;
 };
 
 /**
- * enum station_stats_flags - station statistics flags
+ * enum station_info_flags - station information flags
  *
- * Used by the driver to indicate which info in &struct station_stats
- * it has filled in during get_station().
+ * Used by the driver to indicate which info in &struct station_info
+ * it has filled in during get_station() or dump_station().
  *
- * @STATION_STAT_INACTIVE_TIME: @inactive_time filled
- * @STATION_STAT_RX_BYTES: @rx_bytes filled
- * @STATION_STAT_TX_BYTES: @tx_bytes filled
+ * @STATION_INFO_INACTIVE_TIME: @inactive_time filled
+ * @STATION_INFO_RX_BYTES: @rx_bytes filled
+ * @STATION_INFO_TX_BYTES: @tx_bytes filled
+ * @STATION_INFO_LLID: @llid filled
+ * @STATION_INFO_PLID: @plid filled
+ * @STATION_INFO_PLINK_STATE: @plink_state filled
  */
-enum station_stats_flags {
-        STATION_STAT_INACTIVE_TIME      = 1<<0,
-        STATION_STAT_RX_BYTES           = 1<<1,
-        STATION_STAT_TX_BYTES           = 1<<2,
+enum station_info_flags {
+        STATION_INFO_INACTIVE_TIME      = 1<<0,
+        STATION_INFO_RX_BYTES           = 1<<1,
+        STATION_INFO_TX_BYTES           = 1<<2,
+        STATION_INFO_LLID               = 1<<3,
+        STATION_INFO_PLID               = 1<<4,
+        STATION_INFO_PLINK_STATE        = 1<<5,
 };
 
 /**
- * struct station_stats - station statistics
+ * struct station_info - station information
  *
- * Station information filled by driver for get_station().
+ * Station information filled by driver for get_station() and dump_station.
  *
- * @filled: bitflag of flags from &enum station_stats_flags
+ * @filled: bitflag of flags from &enum station_info_flags
  * @inactive_time: time since last station activity (tx/rx) in milliseconds
  * @rx_bytes: bytes received from this station
  * @tx_bytes: bytes transmitted to this station
+ * @llid: mesh local link id
+ * @plid: mesh peer link id
+ * @plink_state: mesh peer link state
  */
-struct station_stats {
+struct station_info {
         u32 filled;
         u32 inactive_time;
         u32 rx_bytes;
         u32 tx_bytes;
+        u16 llid;
+        u16 plid;
+        u8 plink_state;
 };
 
 /**
@@ -183,6 +219,56 @@ enum monitor_flags {
         MONITOR_FLAG_COOK_FRAMES        = 1<<NL80211_MNTR_FLAG_COOK_FRAMES,
 };
 
+/**
+ * enum mpath_info_flags -  mesh path information flags
+ *
+ * Used by the driver to indicate which info in &struct mpath_info it has filled
+ * in during get_station() or dump_station().
+ *
+ * MPATH_INFO_FRAME_QLEN: @frame_qlen filled
+ * MPATH_INFO_DSN: @dsn filled
+ * MPATH_INFO_METRIC: @metric filled
+ * MPATH_INFO_EXPTIME: @exptime filled
+ * MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled
+ * MPATH_INFO_DISCOVERY_RETRIES: @discovery_retries filled
+ * MPATH_INFO_FLAGS: @flags filled
+ */
+enum mpath_info_flags {
+        MPATH_INFO_FRAME_QLEN           = BIT(0),
+        MPATH_INFO_DSN                  = BIT(1),
+        MPATH_INFO_METRIC               = BIT(2),
+        MPATH_INFO_EXPTIME              = BIT(3),
+        MPATH_INFO_DISCOVERY_TIMEOUT    = BIT(4),
+        MPATH_INFO_DISCOVERY_RETRIES    = BIT(5),
+        MPATH_INFO_FLAGS                = BIT(6),
+};
+
+/**
+ * struct mpath_info - mesh path information
+ *
+ * Mesh path information filled by driver for get_mpath() and dump_mpath().
+ *
+ * @filled: bitfield of flags from &enum mpath_info_flags
+ * @frame_qlen: number of queued frames for this destination
+ * @dsn: destination sequence number
+ * @metric: metric (cost) of this mesh path
+ * @exptime: expiration time for the mesh path from now, in msecs
+ * @flags: mesh path flags
+ * @discovery_timeout: total mesh path discovery timeout, in msecs
+ * @discovery_retries: mesh path discovery retries
+ */
+struct mpath_info {
+        u32 filled;
+        u32 frame_qlen;
+        u32 dsn;
+        u32 metric;
+        u32 exptime;
+        u32 discovery_timeout;
+        u8 discovery_retries;
+        u8 flags;
+};
+
+
 /* from net/wireless.h */
 struct wiphy;
 
@@ -230,13 +316,17 @@ struct wiphy;
  * @del_station: Remove a station; @mac may be NULL to remove all stations.
  *
  * @change_station: Modify a given station.
+ *
+ * @set_mesh_cfg: set mesh parameters (by now, just mesh id)
  */
 struct cfg80211_ops {
         int     (*add_virtual_intf)(struct wiphy *wiphy, char *name,
-                                    enum nl80211_iftype type, u32 *flags);
+                                    enum nl80211_iftype type, u32 *flags,
+                                    struct vif_params *params);
         int     (*del_virtual_intf)(struct wiphy *wiphy, int ifindex);
         int     (*change_virtual_intf)(struct wiphy *wiphy, int ifindex,
-                                       enum nl80211_iftype type, u32 *flags);
+                                       enum nl80211_iftype type, u32 *flags,
+                                       struct vif_params *params);
 
         int     (*add_key)(struct wiphy *wiphy, struct net_device *netdev,
                            u8 key_index, u8 *mac_addr,
@@ -264,7 +354,22 @@ struct cfg80211_ops {
         int     (*change_station)(struct wiphy *wiphy, struct net_device *dev,
                                   u8 *mac, struct station_parameters *params);
         int     (*get_station)(struct wiphy *wiphy, struct net_device *dev,
-                               u8 *mac, struct station_stats *stats);
+                               u8 *mac, struct station_info *sinfo);
+        int     (*dump_station)(struct wiphy *wiphy, struct net_device *dev,
+                               int idx, u8 *mac, struct station_info *sinfo);
+
+        int     (*add_mpath)(struct wiphy *wiphy, struct net_device *dev,
+                               u8 *dst, u8 *next_hop);
+        int     (*del_mpath)(struct wiphy *wiphy, struct net_device *dev,
+                               u8 *dst);
+        int     (*change_mpath)(struct wiphy *wiphy, struct net_device *dev,
+                                  u8 *dst, u8 *next_hop);
+        int     (*get_mpath)(struct wiphy *wiphy, struct net_device *dev,
+                               u8 *dst, u8 *next_hop,
+                               struct mpath_info *pinfo);
+        int     (*dump_mpath)(struct wiphy *wiphy, struct net_device *dev,
+                               int idx, u8 *dst, u8 *next_hop,
+                               struct mpath_info *pinfo);
 };
 
 #endif /* __NET_CFG80211_H */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 7a80c3981237..5ab6a350ee6d 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -205,6 +205,62 @@ struct ieee80211_bss_conf {
         bool use_short_preamble;
 };
 
+/**
+ * enum mac80211_tx_control_flags - flags to describe Tx configuration for
+ *                                  the Tx frame
+ *
+ * These flags are used with the @flags member of &ieee80211_tx_control
+ *
+ * @IEEE80211_TXCTL_REQ_TX_STATUS: request TX status callback for this frame.
+ * @IEEE80211_TXCTL_DO_NOT_ENCRYPT: send this frame without encryption;
+ *                                  e.g., for EAPOL frame
+ * @IEEE80211_TXCTL_USE_RTS_CTS: use RTS-CTS before sending frame
+ * @IEEE80211_TXCTL_USE_CTS_PROTECT: use CTS protection for the frame (e.g.,
+ *                                   for combined 802.11g / 802.11b networks)
+ * @IEEE80211_TXCTL_NO_ACK: tell the low level not to wait for an ack
+ * @IEEE80211_TXCTL_RATE_CTRL_PROBE
+ * @EEE80211_TXCTL_CLEAR_PS_FILT: clear powersave filter
+ *                                 for destination station
+ * @IEEE80211_TXCTL_REQUEUE:
+ * @IEEE80211_TXCTL_FIRST_FRAGMENT: this is a first fragment of the frame
+ * @IEEE80211_TXCTL_LONG_RETRY_LIMIT: this frame should be send using the
+ *                                    through set_retry_limit configured long
+ *                                    retry value
+ * @IEEE80211_TXCTL_EAPOL_FRAME: internal to mac80211
+ * @IEEE80211_TXCTL_SEND_AFTER_DTIM: send this frame after DTIM beacon
+ * @IEEE80211_TXCTL_AMPDU: this frame should be sent as part of an A-MPDU
+ * @IEEE80211_TXCTL_OFDM_HT: this frame can be sent in HT OFDM rates. number
+ *                           of streams when this flag is on can be extracted
+ *                           from antenna_sel_tx, so if 1 antenna is marked
+ *                           use SISO, 2 antennas marked use MIMO, n antennas
+ *                           marked use MIMO_n.
+ * @IEEE80211_TXCTL_GREEN_FIELD: use green field protection for this frame
+ * @IEEE80211_TXCTL_40_MHZ_WIDTH: send this frame using 40 Mhz channel width
+ * @IEEE80211_TXCTL_DUP_DATA: duplicate data frame on both 20 Mhz channels
+ * @IEEE80211_TXCTL_SHORT_GI: send this frame using short guard interval
+ */
+enum mac80211_tx_control_flags {
+        IEEE80211_TXCTL_REQ_TX_STATUS           = (1<<0),
+        IEEE80211_TXCTL_DO_NOT_ENCRYPT          = (1<<1),
+        IEEE80211_TXCTL_USE_RTS_CTS             = (1<<2),
+        IEEE80211_TXCTL_USE_CTS_PROTECT         = (1<<3),
+        IEEE80211_TXCTL_NO_ACK                  = (1<<4),
+        IEEE80211_TXCTL_RATE_CTRL_PROBE         = (1<<5),
+        IEEE80211_TXCTL_CLEAR_PS_FILT           = (1<<6),
+        IEEE80211_TXCTL_REQUEUE                 = (1<<7),
+        IEEE80211_TXCTL_FIRST_FRAGMENT          = (1<<8),
+        IEEE80211_TXCTL_SHORT_PREAMBLE          = (1<<9),
+        IEEE80211_TXCTL_LONG_RETRY_LIMIT        = (1<<10),
+        IEEE80211_TXCTL_EAPOL_FRAME             = (1<<11),
+        IEEE80211_TXCTL_SEND_AFTER_DTIM         = (1<<12),
+        IEEE80211_TXCTL_AMPDU                   = (1<<13),
+        IEEE80211_TXCTL_OFDM_HT                 = (1<<14),
+        IEEE80211_TXCTL_GREEN_FIELD             = (1<<15),
+        IEEE80211_TXCTL_40_MHZ_WIDTH            = (1<<16),
+        IEEE80211_TXCTL_DUP_DATA                = (1<<17),
+        IEEE80211_TXCTL_SHORT_GI                = (1<<18),
+};
+
 /* Transmit control fields. This data structure is passed to low-level driver
  * with each TX frame. The low-level driver is responsible for configuring
  * the hardware to use given values (depending on what is supported). */
@@ -219,42 +275,14 @@ struct ieee80211_tx_control {
         /* retry rate for the last retries */
         struct ieee80211_rate *alt_retry_rate;
 
-#define IEEE80211_TXCTL_REQ_TX_STATUS   (1<<0)/* request TX status callback for
-                                                * this frame */
-#define IEEE80211_TXCTL_DO_NOT_ENCRYPT  (1<<1) /* send this frame without
-                                                * encryption; e.g., for EAPOL
-                                                * frames */
-#define IEEE80211_TXCTL_USE_RTS_CTS     (1<<2) /* use RTS-CTS before sending
-                                                * frame */
-#define IEEE80211_TXCTL_USE_CTS_PROTECT (1<<3) /* use CTS protection for the
-                                                * frame (e.g., for combined
-                                                * 802.11g / 802.11b networks) */
-#define IEEE80211_TXCTL_NO_ACK          (1<<4) /* tell the low level not to
-                                                * wait for an ack */
-#define IEEE80211_TXCTL_RATE_CTRL_PROBE (1<<5)
-#define IEEE80211_TXCTL_CLEAR_PS_FILT   (1<<6) /* clear powersave filter
-                                                * for destination station */
-#define IEEE80211_TXCTL_REQUEUE         (1<<7)
-#define IEEE80211_TXCTL_FIRST_FRAGMENT  (1<<8) /* this is a first fragment of
-                                                * the frame */
-#define IEEE80211_TXCTL_SHORT_PREAMBLE  (1<<9)
-#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
-                                                  * using the through
-                                                  * set_retry_limit configured
-                                                  * long retry value */
-#define IEEE80211_TXCTL_EAPOL_FRAME     (1<<11) /* internal to mac80211 */
-#define IEEE80211_TXCTL_SEND_AFTER_DTIM (1<<12) /* send this frame after DTIM
-                                                 * beacon */
-#define IEEE80211_TXCTL_AMPDU           (1<<13) /* this frame should be sent
-                                                 * as part of an A-MPDU */
-        u32 flags;                             /* tx control flags defined
-                                                * above */
+        u32 flags;              /* tx control flags defined above */
         u8 key_idx;             /* keyidx from hw->set_key(), undefined if
                                  * IEEE80211_TXCTL_DO_NOT_ENCRYPT is set */
         u8 retry_limit;         /* 1 = only first attempt, 2 = one retry, ..
                                  * This could be used when set_retry_limit
                                  * is not implemented by the driver */
-        u8 antenna_sel_tx;      /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
+        u8 antenna_sel_tx;      /* 0 = default/diversity, otherwise bit
+                                 * position represents antenna number used */
         u8 icv_len;             /* length of the ICV/MIC field in octets */
         u8 iv_len;              /* length of the IV field in octets */
         u8 queue;               /* hardware queue to use for this frame;
@@ -407,7 +435,6 @@ enum ieee80211_conf_flags {
  * @channel: the channel to tune to
  */
 struct ieee80211_conf {
-        unsigned int regulatory_domain;
         int radio_enabled;
 
         int beacon_int;
@@ -437,12 +464,14 @@ struct ieee80211_conf {
  * @IEEE80211_IF_TYPE_WDS: interface in WDS mode.
  * @IEEE80211_IF_TYPE_VLAN: VLAN interface bound to an AP, drivers
  *      will never see this type.
+ * @IEEE80211_IF_TYPE_MESH_POINT: 802.11s mesh point
  */
 enum ieee80211_if_types {
         IEEE80211_IF_TYPE_INVALID,
         IEEE80211_IF_TYPE_AP,
         IEEE80211_IF_TYPE_STA,
         IEEE80211_IF_TYPE_IBSS,
+        IEEE80211_IF_TYPE_MESH_POINT,
         IEEE80211_IF_TYPE_MNTR,
         IEEE80211_IF_TYPE_WDS,
         IEEE80211_IF_TYPE_VLAN,
@@ -464,6 +493,14 @@ struct ieee80211_vif {
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
 
+static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
+{
+#ifdef CONFIG_MAC80211_MESH
+        return vif->type == IEEE80211_IF_TYPE_MESH_POINT;
+#endif
+        return false;
+}
+
 /**
  * struct ieee80211_if_init_conf - initial configuration of an interface
  *
@@ -1087,8 +1124,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 /**
  * ieee80211_register_hw - Register hardware device
  *
- * You must call this function before any other functions
- * except ieee80211_register_hwmode.
+ * You must call this function before any other functions in
+ * mac80211. Note that before a hardware can be registered, you
+ * need to fill the contained wiphy's information.
  *
  * @hw: the device to register as returned by ieee80211_alloc_hw()
  */