diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2010-04-27 11:59:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-27 16:09:23 -0400 |
| commit | a060bbfe4ee95d115e8f9705a66894ac34e2c475 (patch) | |
| tree | 6aea616cdd07c06886c0e1ffade68e5d58f9e9c2 /net/mac80211/driver-trace.h | |
| parent | 9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b (diff) | |
| download | op-kernel-dev-a060bbfe4ee95d115e8f9705a66894ac34e2c475.zip op-kernel-dev-a060bbfe4ee95d115e8f9705a66894ac34e2c475.tar.gz | |
mac80211: give virtual interface to hw_scan
When scanning, it is somewhat important to scan
on the correct virtual interface. All drivers
that currently implement hw_scan only support a
single virtual interface, but that may change
and then we'd want to be ready.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/driver-trace.h')
| -rw-r--r-- | net/mac80211/driver-trace.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index e209cb82..ce734b5 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h @@ -363,23 +363,26 @@ TRACE_EVENT(drv_update_tkip_key, TRACE_EVENT(drv_hw_scan, TP_PROTO(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, struct cfg80211_scan_request *req, int ret), - TP_ARGS(local, req, ret), + TP_ARGS(local, sdata, req, ret), TP_STRUCT__entry( LOCAL_ENTRY + VIF_ENTRY __field(int, ret) ), TP_fast_assign( LOCAL_ASSIGN; + VIF_ASSIGN; __entry->ret = ret; ), TP_printk( - LOCAL_PR_FMT " ret:%d", - LOCAL_PR_ARG, __entry->ret + LOCAL_PR_FMT VIF_PR_FMT " ret:%d", + LOCAL_PR_ARG,VIF_PR_ARG, __entry->ret ) ); |
