diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-08-19 12:48:41 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-10-01 06:17:45 -0400 |
commit | 55fff50113daa178010a38e0dc27172f06d17b8e (patch) | |
tree | 575f7f639ec6746c442a7fd5568df346ebf8ac52 /net/mac80211/driver-ops.h | |
parent | 5eb7906b47dcd906b3ffd811e689e0de4a6b1b6a (diff) |
mac80211: add explicit IBSS driver operations
This can be useful for drivers if they have any failure cases
when joining an IBSS. Also move setting the queue parameters
to before this new call, in case the new driver op needs them
already.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/driver-ops.h')
-rw-r--r-- | net/mac80211/driver-ops.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index b3ea11f3d526..5d03c47c0a4c 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h | |||
@@ -1085,4 +1085,31 @@ drv_channel_switch_beacon(struct ieee80211_sub_if_data *sdata, | |||
1085 | } | 1085 | } |
1086 | } | 1086 | } |
1087 | 1087 | ||
1088 | static inline int drv_join_ibss(struct ieee80211_local *local, | ||
1089 | struct ieee80211_sub_if_data *sdata) | ||
1090 | { | ||
1091 | int ret = 0; | ||
1092 | |||
1093 | might_sleep(); | ||
1094 | check_sdata_in_driver(sdata); | ||
1095 | |||
1096 | trace_drv_join_ibss(local, sdata, &sdata->vif.bss_conf); | ||
1097 | if (local->ops->join_ibss) | ||
1098 | ret = local->ops->join_ibss(&local->hw, &sdata->vif); | ||
1099 | trace_drv_return_int(local, ret); | ||
1100 | return ret; | ||
1101 | } | ||
1102 | |||
1103 | static inline void drv_leave_ibss(struct ieee80211_local *local, | ||
1104 | struct ieee80211_sub_if_data *sdata) | ||
1105 | { | ||
1106 | might_sleep(); | ||
1107 | check_sdata_in_driver(sdata); | ||
1108 | |||
1109 | trace_drv_leave_ibss(local, sdata); | ||
1110 | if (local->ops->leave_ibss) | ||
1111 | local->ops->leave_ibss(&local->hw, &sdata->vif); | ||
1112 | trace_drv_return_void(local); | ||
1113 | } | ||
1114 | |||
1088 | #endif /* __MAC80211_DRIVER_OPS */ | 1115 | #endif /* __MAC80211_DRIVER_OPS */ |