Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: make remain_on_channel() op pass vif param 

Drivers (e.g. wl12xx) might need to know the vif
to roc on (mainly in order to configure the
rx filters correctly).

Add the vif to the op params, and update the current
users (iwlwifi) to use the new api.

Signed-off-by: Eliad Peller <eliad@wizery.com>
[fix hwsim]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Eliad Peller 2012-11-19 17:05:09 +02:00 committed by Johannes Berg
parent 3475b0946b
commit 4988456862
7 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/dvm/mac80211.c
View File

@ -1032,6 +1032,7 @@ done:
}
static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_channel *channel,
enum nl80211_channel_type channel_type,
int duration)

1
drivers/net/wireless/mac80211_hwsim.c
View File

@ -1453,6 +1453,7 @@ static void hw_roc_done(struct work_struct *work)
}
static int mac80211_hwsim_roc(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type,
int duration)

1
include/net/mac80211.h
View File

@ -2530,6 +2530,7 @@ struct ieee80211_ops {
int (*get_antenna)(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);
int (*remain_on_channel)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type,
int duration);

6
net/mac80211/cfg.c
View File

@ -2287,7 +2287,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
if (!duration)
duration = 10;
ret = drv_remain_on_channel(local, channel, channel_type, duration);
ret = drv_remain_on_channel(local, sdata, channel, channel_type,
duration);
if (ret) {
kfree(roc);
return ret;
@ -2298,7 +2299,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
out_check_combine:
list_for_each_entry(tmp, &local->roc_list, list) {
if (tmp->chan != channel || tmp->chan_type != channel_type)
if (tmp->chan != channel || tmp->chan_type != channel_type ||
tmp->sdata != sdata)
continue;
/*

7
net/mac80211/driver-ops.h
View File

@ -704,6 +704,7 @@ static inline int drv_get_antenna(struct ieee80211_local *local,
}
static inline int drv_remain_on_channel(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
struct ieee80211_channel *chan,
enum nl80211_channel_type chantype,
unsigned int duration)
@ -712,9 +713,9 @@ static inline int drv_remain_on_channel(struct ieee80211_local *local,
might_sleep();
trace_drv_remain_on_channel(local, chan, chantype, duration);
ret = local->ops->remain_on_channel(&local->hw, chan, chantype,
duration);
trace_drv_remain_on_channel(local, sdata, chan, chantype, duration);
ret = local->ops->remain_on_channel(&local->hw, &sdata->vif,
chan, chantype, duration);
trace_drv_return_int(local, ret);
return ret;

2
net/mac80211/offchannel.c
View File

@ -283,7 +283,7 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
if (!duration)
duration = 10;
ret = drv_remain_on_channel(local, roc->chan,
ret = drv_remain_on_channel(local, roc->sdata, roc->chan,
roc->chan_type,
duration);

13
net/mac80211/trace.h
View File

@ -1019,13 +1019,16 @@ TRACE_EVENT(drv_get_antenna,
);
TRACE_EVENT(drv_remain_on_channel,
TP_PROTO(struct ieee80211_local *local, struct ieee80211_channel *chan,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
struct ieee80211_channel *chan,
enum nl80211_channel_type chantype, unsigned int duration),
TP_ARGS(local, chan, chantype, duration),
TP_ARGS(local, sdata, chan, chantype, duration),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
__field(int, center_freq)
__field(int, channel_type)
__field(unsigned int, duration)
@ -1033,14 +1036,16 @@ TRACE_EVENT(drv_remain_on_channel,
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
__entry->center_freq = chan->center_freq;
__entry->channel_type = chantype;
__entry->duration = duration;
),
TP_printk(
LOCAL_PR_FMT " freq:%dMHz duration:%dms",
LOCAL_PR_ARG, __entry->center_freq, __entry->duration
LOCAL_PR_FMT VIF_PR_FMT " freq:%dMHz duration:%dms",
LOCAL_PR_ARG, VIF_PR_ARG,
__entry->center_freq, __entry->duration
)
);