projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: introduce flush operation
[deliverable/linux.git]
/
net
/
mac80211
/
driver-ops.h
diff --git
a/net/mac80211/driver-ops.h
b/net/mac80211/driver-ops.h
index 020a94a31106ab6668166203601d4a6fb12be384..cbe133bcdf34548b8975ce0d6881466aa51c7c9c 100644
(file)
--- a/
net/mac80211/driver-ops.h
+++ b/
net/mac80211/driver-ops.h
@@
-39,7
+39,7
@@
static inline int drv_add_interface(struct ieee80211_local *local,
struct ieee80211_if_init_conf *conf)
{
int ret = local->ops->add_interface(&local->hw, conf);
struct ieee80211_if_init_conf *conf)
{
int ret = local->ops->add_interface(&local->hw, conf);
- trace_drv_add_interface(local,
conf->mac_addr, conf->vif
, ret);
+ trace_drv_add_interface(local,
vif_to_sdata(conf->vif)
, ret);
return ret;
}
return ret;
}
@@
-47,7
+47,7
@@
static inline void drv_remove_interface(struct ieee80211_local *local,
struct ieee80211_if_init_conf *conf)
{
local->ops->remove_interface(&local->hw, conf);
struct ieee80211_if_init_conf *conf)
{
local->ops->remove_interface(&local->hw, conf);
- trace_drv_remove_interface(local,
conf->mac_addr, conf->vif
);
+ trace_drv_remove_interface(local,
vif_to_sdata(conf->vif)
);
}
static inline int drv_config(struct ieee80211_local *local, u32 changed)
}
static inline int drv_config(struct ieee80211_local *local, u32 changed)
@@
-58,13
+58,13
@@
static inline int drv_config(struct ieee80211_local *local, u32 changed)
}
static inline void drv_bss_info_changed(struct ieee80211_local *local,
}
static inline void drv_bss_info_changed(struct ieee80211_local *local,
- struct ieee80211_
vif *vif
,
+ struct ieee80211_
sub_if_data *sdata
,
struct ieee80211_bss_conf *info,
u32 changed)
{
if (local->ops->bss_info_changed)
struct ieee80211_bss_conf *info,
u32 changed)
{
if (local->ops->bss_info_changed)
- local->ops->bss_info_changed(&local->hw, vif, info, changed);
- trace_drv_bss_info_changed(local,
vif
, info, changed);
+ local->ops->bss_info_changed(&local->hw,
&sdata->
vif, info, changed);
+ trace_drv_bss_info_changed(local,
sdata
, info, changed);
}
static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
}
static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
@@
-106,12
+106,13
@@
static inline int drv_set_tim(struct ieee80211_local *local,
}
static inline int drv_set_key(struct ieee80211_local *local,
}
static inline int drv_set_key(struct ieee80211_local *local,
- enum set_key_cmd cmd, struct ieee80211_vif *vif,
+ enum set_key_cmd cmd,
+ struct ieee80211_sub_if_data *sdata,
struct ieee80211_sta *sta,
struct ieee80211_key_conf *key)
{
struct ieee80211_sta *sta,
struct ieee80211_key_conf *key)
{
- int ret = local->ops->set_key(&local->hw, cmd, vif, sta, key);
- trace_drv_set_key(local, cmd,
vif
, sta, key, ret);
+ int ret = local->ops->set_key(&local->hw, cmd,
&sdata->
vif, sta, key);
+ trace_drv_set_key(local, cmd,
sdata
, sta, key, ret);
return ret;
}
return ret;
}
@@
-179,13
+180,13
@@
static inline int drv_set_rts_threshold(struct ieee80211_local *local,
}
static inline void drv_sta_notify(struct ieee80211_local *local,
}
static inline void drv_sta_notify(struct ieee80211_local *local,
- struct ieee80211_
vif *vif
,
+ struct ieee80211_
sub_if_data *sdata
,
enum sta_notify_cmd cmd,
struct ieee80211_sta *sta)
{
if (local->ops->sta_notify)
enum sta_notify_cmd cmd,
struct ieee80211_sta *sta)
{
if (local->ops->sta_notify)
- local->ops->sta_notify(&local->hw, vif, cmd, sta);
- trace_drv_sta_notify(local,
vif
, cmd, sta);
+ local->ops->sta_notify(&local->hw,
&sdata->
vif, cmd, sta);
+ trace_drv_sta_notify(local,
sdata
, cmd, sta);
}
static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
}
static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
@@
-239,15
+240,16
@@
static inline int drv_tx_last_beacon(struct ieee80211_local *local)
}
static inline int drv_ampdu_action(struct ieee80211_local *local,
}
static inline int drv_ampdu_action(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid,
u16 *ssn)
{
int ret = -EOPNOTSUPP;
if (local->ops->ampdu_action)
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid,
u16 *ssn)
{
int ret = -EOPNOTSUPP;
if (local->ops->ampdu_action)
- ret = local->ops->ampdu_action(&local->hw, action,
+ ret = local->ops->ampdu_action(&local->hw,
&sdata->vif,
action,
sta, tid, ssn);
sta, tid, ssn);
- trace_drv_ampdu_action(local, action, sta, tid, ssn, ret);
+ trace_drv_ampdu_action(local,
sdata,
action, sta, tid, ssn, ret);
return ret;
}
return ret;
}
@@
-257,4
+259,11
@@
static inline void drv_rfkill_poll(struct ieee80211_local *local)
if (local->ops->rfkill_poll)
local->ops->rfkill_poll(&local->hw);
}
if (local->ops->rfkill_poll)
local->ops->rfkill_poll(&local->hw);
}
+
+static inline void drv_flush(struct ieee80211_local *local, bool drop)
+{
+ trace_drv_flush(local, drop);
+ if (local->ops->flush)
+ local->ops->flush(&local->hw, drop);
+}
#endif /* __MAC80211_DRIVER_OPS */
#endif /* __MAC80211_DRIVER_OPS */
This page took
0.135058 seconds
and
5
git commands to generate.