summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2013-07-31 11:06:22 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-08-12 08:11:42 -0400
commit52981cd79461e47fe683febfcbd3d380c72b1c6c (patch)
treea6d149e4d43930d57c81f7a2b00380b26a395307 /include/net
parentfc73f11f5fa230f8c687d51b0fddb00433092ce0 (diff)
mac80211: add vif to testmode cmd
Pass the wdev from cfg80211 on to the driver as the vif if given and it's valid for the driver. Signed-off-by: David Spinadel <david.spinadel@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index b70c00111323..df93c77c97ab 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2516,8 +2516,8 @@ enum ieee80211_roc_type {
2516 * in IEEE 802.11-2007 section 17.3.8.6 and modify ACK timeout 2516 * in IEEE 802.11-2007 section 17.3.8.6 and modify ACK timeout
2517 * accordingly. This callback is not required and may sleep. 2517 * accordingly. This callback is not required and may sleep.
2518 * 2518 *
2519 * @testmode_cmd: Implement a cfg80211 test mode command. 2519 * @testmode_cmd: Implement a cfg80211 test mode command. The passed @vif may
2520 * The callback can sleep. 2520 * be %NULL. The callback can sleep.
2521 * @testmode_dump: Implement a cfg80211 test mode dump. The callback can sleep. 2521 * @testmode_dump: Implement a cfg80211 test mode dump. The callback can sleep.
2522 * 2522 *
2523 * @flush: Flush all pending frames from the hardware queue, making sure 2523 * @flush: Flush all pending frames from the hardware queue, making sure
@@ -2778,7 +2778,8 @@ struct ieee80211_ops {
2778 void (*rfkill_poll)(struct ieee80211_hw *hw); 2778 void (*rfkill_poll)(struct ieee80211_hw *hw);
2779 void (*set_coverage_class)(struct ieee80211_hw *hw, u8 coverage_class); 2779 void (*set_coverage_class)(struct ieee80211_hw *hw, u8 coverage_class);
2780#ifdef CONFIG_NL80211_TESTMODE 2780#ifdef CONFIG_NL80211_TESTMODE
2781 int (*testmode_cmd)(struct ieee80211_hw *hw, void *data, int len); 2781 int (*testmode_cmd)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
2782 void *data, int len);
2782 int (*testmode_dump)(struct ieee80211_hw *hw, struct sk_buff *skb, 2783 int (*testmode_dump)(struct ieee80211_hw *hw, struct sk_buff *skb,
2783 struct netlink_callback *cb, 2784 struct netlink_callback *cb,
2784 void *data, int len); 2785 void *data, int len);