diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-07 14:07:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-07 14:07:18 +1100 |
| commit | b1ba3c82877c9458f307c78eda0233b6e9ff4a9a (patch) | |
| tree | c42b47633d6d1d509ad71cd6eda0b0e58fac3088 /net/mac80211/ieee80211_i.h | |
| parent | c33b661d4dc3a776dae0eedb6f82cdac2e2beace (diff) | |
Revert "cfg80211/mac80211: add mesh join/leave commands"
This reverts commit 29cbe68c516a48a9a88b3226878570c6cbd83c02.
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 72499fe5fc36..e7c880725639 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -609,6 +609,19 @@ struct ieee80211_sub_if_data *vif_to_sdata(struct ieee80211_vif *p) return container_of(p, struct ieee80211_sub_if_data, vif); } +static inline void +ieee80211_sdata_set_mesh_id(struct ieee80211_sub_if_data *sdata, + u8 mesh_id_len, u8 *mesh_id) +{ +#ifdef CONFIG_MAC80211_MESH + struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + ifmsh->mesh_id_len = mesh_id_len; + memcpy(ifmsh->mesh_id, mesh_id, mesh_id_len); +#else + WARN_ON(1); +#endif +} + enum sdata_queue_type { IEEE80211_SDATA_QUEUE_TYPE_FRAME = 0, IEEE80211_SDATA_QUEUE_AGG_START = 1, |