openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: Add support for QoS mapping 

Implement set_qos_map() handler for mac80211 to enable QoS mapping
functionality.

Signed-off-by: Kyeyoon Park <kyeyoonp@qca.qualcomm.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Kyeyoon Park 2013-12-16 23:04:43 -08:00 committed by Johannes Berg
parent fa9ffc7456
commit 32db6b54df
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/mac80211/cfg.c
View File

@ -3837,6 +3837,31 @@ static void ieee80211_set_wakeup(struct wiphy *wiphy, bool enabled)
} }
#endif #endif
static int ieee80211_set_qos_map(struct wiphy *wiphy,
struct net_device *dev,
struct cfg80211_qos_map *qos_map)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct mac80211_qos_map *new_qos_map, *old_qos_map;
if (qos_map) {
new_qos_map = kzalloc(sizeof(*new_qos_map), GFP_KERNEL);
if (!new_qos_map)
return -ENOMEM;
memcpy(&new_qos_map->qos_map, qos_map, sizeof(*qos_map));
} else {
/* A NULL qos_map was passed to disable QoS mapping */
new_qos_map = NULL;
}
old_qos_map = rtnl_dereference(sdata->qos_map);
rcu_assign_pointer(sdata->qos_map, new_qos_map);
if (old_qos_map)
kfree_rcu(old_qos_map, rcu_head);
return 0;
}
struct cfg80211_ops mac80211_config_ops = { struct cfg80211_ops mac80211_config_ops = {
.add_virtual_intf = ieee80211_add_iface, .add_virtual_intf = ieee80211_add_iface,
.del_virtual_intf = ieee80211_del_iface, .del_virtual_intf = ieee80211_del_iface,
@ -3916,4 +3941,5 @@ struct cfg80211_ops mac80211_config_ops = {
.get_channel = ieee80211_cfg_get_channel, .get_channel = ieee80211_cfg_get_channel,
.start_radar_detection = ieee80211_start_radar_detection, .start_radar_detection = ieee80211_start_radar_detection,
.channel_switch = ieee80211_channel_switch, .channel_switch = ieee80211_channel_switch,
.set_qos_map = ieee80211_set_qos_map,
}; };

6
net/mac80211/ieee80211_i.h
View File

@ -694,6 +694,11 @@ struct ieee80211_chanctx {
struct ieee80211_chanctx_conf conf; struct ieee80211_chanctx_conf conf;
}; };
struct mac80211_qos_map {
struct cfg80211_qos_map qos_map;
struct rcu_head rcu_head;
};
struct ieee80211_sub_if_data { struct ieee80211_sub_if_data {
struct list_head list; struct list_head list;
@ -739,6 +744,7 @@ struct ieee80211_sub_if_data {
int encrypt_headroom; int encrypt_headroom;
struct ieee80211_tx_queue_params tx_conf[IEEE80211_NUM_ACS]; struct ieee80211_tx_queue_params tx_conf[IEEE80211_NUM_ACS];
struct mac80211_qos_map __rcu *qos_map;
struct work_struct csa_finalize_work; struct work_struct csa_finalize_work;
int csa_counter_offset_beacon; int csa_counter_offset_beacon;

7
net/mac80211/wme.c
View File

@ -106,6 +106,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
const u8 *ra = NULL; const u8 *ra = NULL;
bool qos = false; bool qos = false;
struct mac80211_qos_map *qos_map;
if (local->hw.queues < IEEE80211_NUM_ACS || skb->len < 6) { if (local->hw.queues < IEEE80211_NUM_ACS || skb->len < 6) {
skb->priority = 0; /* required for correct WPA/11i MIC */ skb->priority = 0; /* required for correct WPA/11i MIC */
@ -155,7 +156,11 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
/* use the data classifier to determine what 802.1d tag the /* use the data classifier to determine what 802.1d tag the
* data frame has */ * data frame has */
skb->priority = cfg80211_classify8021d(skb, NULL); rcu_read_lock();
qos_map = rcu_dereference(sdata->qos_map);
skb->priority = cfg80211_classify8021d(skb, qos_map ?
&qos_map->qos_map : NULL);
rcu_read_unlock();
return ieee80211_downgrade_queue(sdata, skb); return ieee80211_downgrade_queue(sdata, skb);
} }