system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

cfg80211: add tracing for P2P Device start/stop

Browse source 
These were missed due to the tracing work having
started on a kernel that didn't have P2P Device
yet, implement them now.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2012-10-23 15:16:50 +02:00
parent 5d0d04e477
commit eeb126e9ee
4 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/wireless/core.c
View file

@ -241,7 +241,7 @@ static int cfg80211_rfkill_set_block(void *data, bool blocked)
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
if (!wdev->p2p_started) if (!wdev->p2p_started)
break; break;
rdev->ops->stop_p2p_device(&rdev->wiphy, wdev); rdev_stop_p2p_device(rdev, wdev);
wdev->p2p_started = false; wdev->p2p_started = false;
rdev->opencount--; rdev->opencount--;
break; break;
@ -774,7 +774,7 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev)
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
if (!wdev->p2p_started) if (!wdev->p2p_started)
break; break;
rdev->ops->stop_p2p_device(&rdev->wiphy, wdev); rdev_stop_p2p_device(rdev, wdev);
wdev->p2p_started = false; wdev->p2p_started = false;
rdev->opencount--; rdev->opencount--;
break; break;

4
net/wireless/nl80211.c
View file

@ -6932,7 +6932,7 @@ static int nl80211_start_p2p_device(struct sk_buff *skb, struct genl_info *info)
if (err) if (err)
return err; return err;
err = rdev->ops->start_p2p_device(&rdev->wiphy, wdev); err = rdev_start_p2p_device(rdev, wdev);
if (err) if (err)
return err; return err;
@ -6958,7 +6958,7 @@ static int nl80211_stop_p2p_device(struct sk_buff *skb, struct genl_info *info)
if (!wdev->p2p_started) if (!wdev->p2p_started)
return 0; return 0;
rdev->ops->stop_p2p_device(&rdev->wiphy, wdev); rdev_stop_p2p_device(rdev, wdev);
wdev->p2p_started = false; wdev->p2p_started = false;
mutex_lock(&rdev->devlist_mtx); mutex_lock(&rdev->devlist_mtx);

18
net/wireless/rdev-ops.h
View file

@ -858,4 +858,22 @@ static inline struct ieee80211_channel
return ret; return ret;
} }
static inline int rdev_start_p2p_device(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev)
{
int ret;
trace_rdev_start_p2p_device(&rdev->wiphy, wdev);
ret = rdev->ops->start_p2p_device(&rdev->wiphy, wdev);
trace_rdev_return_int(&rdev->wiphy, ret);
return ret;
}
static inline void rdev_stop_p2p_device(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev)
{
trace_rdev_stop_p2p_device(&rdev->wiphy, wdev);
rdev->ops->stop_p2p_device(&rdev->wiphy, wdev);
trace_rdev_return_void(&rdev->wiphy);
}
#endif /* __CFG80211_RDEV_OPS */ #endif /* __CFG80211_RDEV_OPS */

10
net/wireless/trace.h
View file

@ -1741,6 +1741,16 @@ TRACE_EVENT(rdev_return_channel,
WIPHY_PR_ARG, CHAN_PR_ARG, __entry->type) WIPHY_PR_ARG, CHAN_PR_ARG, __entry->type)
); );
DEFINE_EVENT(wiphy_wdev_evt, rdev_start_p2p_device,
TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
TP_ARGS(wiphy, wdev)
);
DEFINE_EVENT(wiphy_wdev_evt, rdev_stop_p2p_device,
TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
TP_ARGS(wiphy, wdev)
);
/************************************************************* /*************************************************************
* cfg80211 exported functions traces * * cfg80211 exported functions traces *
*************************************************************/ *************************************************************/