cfg80211: clarify set_channel APIs
Now that we've removed all uses of the set_channel API except for the monitor channel and in libertas, clarify this. Split the libertas mesh use into a new libertas_set_mesh_channel() operation, just to keep backward compatibility, and rename the normal set_channel() to set_monitor_channel(). Also describe the desired set_monitor_channel() semantics more clearly. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
7c9c46c16d
commit
e8c9bd5b8d
@@ -131,16 +131,13 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
|
||||
|
||||
int lbs_mesh_set_channel(struct lbs_private *priv, u8 channel)
|
||||
{
|
||||
priv->mesh_channel = channel;
|
||||
return lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START, channel);
|
||||
}
|
||||
|
||||
static uint16_t lbs_mesh_get_channel(struct lbs_private *priv)
|
||||
{
|
||||
struct wireless_dev *mesh_wdev = priv->mesh_dev->ieee80211_ptr;
|
||||
if (mesh_wdev->channel)
|
||||
return mesh_wdev->channel->hw_value;
|
||||
else
|
||||
return 1;
|
||||
return priv->mesh_channel ?: 1;
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
|
Reference in New Issue
Block a user