Commit 1ebf8b42 authored by David S. Miller's avatar David S. Miller

Merge tag 'mac80211-next-for-davem-2016-10-04' of...

Merge tag 'mac80211-next-for-davem-2016-10-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
This time around, we have
 * Neighbor Awareness Networking (NAN) APIs
 * a fix for a previous patch that caused memory corruption
   in wireless extensions key settings
 * beacon rate configuration for AP and mesh
 * memory limits for mac80211's internal TXQs
 * a (fairly involved) fix for the TXQ vs. crypto problems
 * direct cfg80211 driver API for WEP keys

This also pulls in net-next to fix the merge conflicts, see
the merge commit for more details.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9a8dd213 1e1430d5
This diff is collapsed.
...@@ -72,9 +72,12 @@ struct fq { ...@@ -72,9 +72,12 @@ struct fq {
u32 flows_cnt; u32 flows_cnt;
u32 perturbation; u32 perturbation;
u32 limit; u32 limit;
u32 memory_limit;
u32 memory_usage;
u32 quantum; u32 quantum;
u32 backlog; u32 backlog;
u32 overlimit; u32 overlimit;
u32 overmemory;
u32 collisions; u32 collisions;
}; };
......
...@@ -29,6 +29,7 @@ static struct sk_buff *fq_flow_dequeue(struct fq *fq, ...@@ -29,6 +29,7 @@ static struct sk_buff *fq_flow_dequeue(struct fq *fq,
tin->backlog_packets--; tin->backlog_packets--;
flow->backlog -= skb->len; flow->backlog -= skb->len;
fq->backlog--; fq->backlog--;
fq->memory_usage -= skb->truesize;
if (flow->backlog == 0) { if (flow->backlog == 0) {
list_del_init(&flow->backlogchain); list_del_init(&flow->backlogchain);
...@@ -154,6 +155,7 @@ static void fq_tin_enqueue(struct fq *fq, ...@@ -154,6 +155,7 @@ static void fq_tin_enqueue(struct fq *fq,
flow->backlog += skb->len; flow->backlog += skb->len;
tin->backlog_bytes += skb->len; tin->backlog_bytes += skb->len;
tin->backlog_packets++; tin->backlog_packets++;
fq->memory_usage += skb->truesize;
fq->backlog++; fq->backlog++;
fq_recalc_backlog(fq, tin, flow); fq_recalc_backlog(fq, tin, flow);
...@@ -166,7 +168,7 @@ static void fq_tin_enqueue(struct fq *fq, ...@@ -166,7 +168,7 @@ static void fq_tin_enqueue(struct fq *fq,
__skb_queue_tail(&flow->queue, skb); __skb_queue_tail(&flow->queue, skb);
if (fq->backlog > fq->limit) { if (fq->backlog > fq->limit || fq->memory_usage > fq->memory_limit) {
flow = list_first_entry_or_null(&fq->backlogs, flow = list_first_entry_or_null(&fq->backlogs,
struct fq_flow, struct fq_flow,
backlogchain); backlogchain);
...@@ -181,6 +183,8 @@ static void fq_tin_enqueue(struct fq *fq, ...@@ -181,6 +183,8 @@ static void fq_tin_enqueue(struct fq *fq,
flow->tin->overlimit++; flow->tin->overlimit++;
fq->overlimit++; fq->overlimit++;
if (fq->memory_usage > fq->memory_limit)
fq->overmemory++;
} }
} }
...@@ -251,6 +255,7 @@ static int fq_init(struct fq *fq, int flows_cnt) ...@@ -251,6 +255,7 @@ static int fq_init(struct fq *fq, int flows_cnt)
fq->perturbation = prandom_u32(); fq->perturbation = prandom_u32();
fq->quantum = 300; fq->quantum = 300;
fq->limit = 8192; fq->limit = 8192;
fq->memory_limit = 16 << 20; /* 16 MBytes */
fq->flows = kcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL); fq->flows = kcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);
if (!fq->flows) if (!fq->flows)
......
...@@ -715,6 +715,7 @@ enum mac80211_tx_info_flags { ...@@ -715,6 +715,7 @@ enum mac80211_tx_info_flags {
* frame (PS-Poll or uAPSD). * frame (PS-Poll or uAPSD).
* @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
* @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame
* @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path
* *
* These flags are used in tx_info->control.flags. * These flags are used in tx_info->control.flags.
*/ */
...@@ -723,6 +724,7 @@ enum mac80211_tx_control_flags { ...@@ -723,6 +724,7 @@ enum mac80211_tx_control_flags {
IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1), IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
IEEE80211_TX_CTRL_RATE_INJECT = BIT(2), IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
IEEE80211_TX_CTRL_AMSDU = BIT(3), IEEE80211_TX_CTRL_AMSDU = BIT(3),
IEEE80211_TX_CTRL_FAST_XMIT = BIT(4),
}; };
/* /*
...@@ -2177,6 +2179,8 @@ enum ieee80211_hw_flags { ...@@ -2177,6 +2179,8 @@ enum ieee80211_hw_flags {
* @n_cipher_schemes: a size of an array of cipher schemes definitions. * @n_cipher_schemes: a size of an array of cipher schemes definitions.
* @cipher_schemes: a pointer to an array of cipher scheme definitions * @cipher_schemes: a pointer to an array of cipher scheme definitions
* supported by HW. * supported by HW.
* @max_nan_de_entries: maximum number of NAN DE functions supported by the
* device.
*/ */
struct ieee80211_hw { struct ieee80211_hw {
struct ieee80211_conf conf; struct ieee80211_conf conf;
...@@ -2211,6 +2215,7 @@ struct ieee80211_hw { ...@@ -2211,6 +2215,7 @@ struct ieee80211_hw {
u8 uapsd_max_sp_len; u8 uapsd_max_sp_len;
u8 n_cipher_schemes; u8 n_cipher_schemes;
const struct ieee80211_cipher_scheme *cipher_schemes; const struct ieee80211_cipher_scheme *cipher_schemes;
u8 max_nan_de_entries;
}; };
static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw, static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw,
...@@ -3166,6 +3171,12 @@ enum ieee80211_reconfig_type { ...@@ -3166,6 +3171,12 @@ enum ieee80211_reconfig_type {
* required function. * required function.
* The callback can sleep. * The callback can sleep.
* *
* @offset_tsf: Offset the TSF timer by the specified value in the
* firmware/hardware. Preferred to set_tsf as it avoids delay between
* calling set_tsf() and hardware getting programmed, which will show up
* as TSF delay. Is not a required function.
* The callback can sleep.
*
* @reset_tsf: Reset the TSF timer and allow firmware/hardware to synchronize * @reset_tsf: Reset the TSF timer and allow firmware/hardware to synchronize
* with other STAs in the IBSS. This is only used in IBSS mode. This * with other STAs in the IBSS. This is only used in IBSS mode. This
* function is optional if the firmware/hardware takes full care of * function is optional if the firmware/hardware takes full care of
...@@ -3420,6 +3431,21 @@ enum ieee80211_reconfig_type { ...@@ -3420,6 +3431,21 @@ enum ieee80211_reconfig_type {
* synchronization which is needed in case driver has in its RSS queues * synchronization which is needed in case driver has in its RSS queues
* pending frames that were received prior to the control path action * pending frames that were received prior to the control path action
* currently taken (e.g. disassociation) but are not processed yet. * currently taken (e.g. disassociation) but are not processed yet.
*
* @start_nan: join an existing NAN cluster, or create a new one.
* @stop_nan: leave the NAN cluster.
* @nan_change_conf: change NAN configuration. The data in cfg80211_nan_conf
* contains full new configuration and changes specify which parameters
* are changed with respect to the last NAN config.
* The driver gets both full configuration and the changed parameters since
* some devices may need the full configuration while others need only the
* changed parameters.
* @add_nan_func: Add a NAN function. Returns 0 on success. The data in
* cfg80211_nan_func must not be referenced outside the scope of
* this call.
* @del_nan_func: Remove a NAN function. The driver must call
* ieee80211_nan_func_terminated() with
* NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST reason code upon removal.
*/ */
struct ieee80211_ops { struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw, void (*tx)(struct ieee80211_hw *hw,
...@@ -3531,6 +3557,8 @@ struct ieee80211_ops { ...@@ -3531,6 +3557,8 @@ struct ieee80211_ops {
u64 (*get_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); u64 (*get_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
void (*set_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, void (*set_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
u64 tsf); u64 tsf);
void (*offset_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
s64 offset);
void (*reset_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void (*reset_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
int (*tx_last_beacon)(struct ieee80211_hw *hw); int (*tx_last_beacon)(struct ieee80211_hw *hw);
int (*ampdu_action)(struct ieee80211_hw *hw, int (*ampdu_action)(struct ieee80211_hw *hw,
...@@ -3655,6 +3683,21 @@ struct ieee80211_ops { ...@@ -3655,6 +3683,21 @@ struct ieee80211_ops {
void (*wake_tx_queue)(struct ieee80211_hw *hw, void (*wake_tx_queue)(struct ieee80211_hw *hw,
struct ieee80211_txq *txq); struct ieee80211_txq *txq);
void (*sync_rx_queues)(struct ieee80211_hw *hw); void (*sync_rx_queues)(struct ieee80211_hw *hw);
int (*start_nan)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct cfg80211_nan_conf *conf);
int (*stop_nan)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif);
int (*nan_change_conf)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct cfg80211_nan_conf *conf, u32 changes);
int (*add_nan_func)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
const struct cfg80211_nan_func *nan_func);
void (*del_nan_func)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
u8 instance_id);
}; };
/** /**
...@@ -5728,4 +5771,36 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, ...@@ -5728,4 +5771,36 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
void ieee80211_txq_get_depth(struct ieee80211_txq *txq, void ieee80211_txq_get_depth(struct ieee80211_txq *txq,
unsigned long *frame_cnt, unsigned long *frame_cnt,
unsigned long *byte_cnt); unsigned long *byte_cnt);
/**
* ieee80211_nan_func_terminated - notify about NAN function termination.
*
* This function is used to notify mac80211 about NAN function termination.
* Note that this function can't be called from hard irq.
*
* @vif: &struct ieee80211_vif pointer from the add_interface callback.
* @inst_id: the local instance id
* @reason: termination reason (one of the NL80211_NAN_FUNC_TERM_REASON_*)
* @gfp: allocation flags
*/
void ieee80211_nan_func_terminated(struct ieee80211_vif *vif,
u8 inst_id,
enum nl80211_nan_func_term_reason reason,
gfp_t gfp);
/**
* ieee80211_nan_func_match - notify about NAN function match event.
*
* This function is used to notify mac80211 about NAN function match. The
* cookie inside the match struct will be assigned by mac80211.
* Note that this function can't be called from hard irq.
*
* @vif: &struct ieee80211_vif pointer from the add_interface callback.
* @match: match event information
* @gfp: allocation flags
*/
void ieee80211_nan_func_match(struct ieee80211_vif *vif,
struct cfg80211_nan_match_params *match,
gfp_t gfp);
#endif /* MAC80211_H */ #endif /* MAC80211_H */
This diff is collapsed.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
* Copyright 2013-2015 Intel Mobile Communications GmbH * Copyright 2013-2015 Intel Mobile Communications GmbH
* Copyright (C) 2015-2016 Intel Deutschland GmbH
* *
* This file is GPLv2 as found in COPYING. * This file is GPLv2 as found in COPYING.
*/ */
...@@ -152,6 +153,149 @@ static void ieee80211_stop_p2p_device(struct wiphy *wiphy, ...@@ -152,6 +153,149 @@ static void ieee80211_stop_p2p_device(struct wiphy *wiphy,
ieee80211_sdata_stop(IEEE80211_WDEV_TO_SUB_IF(wdev)); ieee80211_sdata_stop(IEEE80211_WDEV_TO_SUB_IF(wdev));
} }
static int ieee80211_start_nan(struct wiphy *wiphy,
struct wireless_dev *wdev,
struct cfg80211_nan_conf *conf)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
int ret;
mutex_lock(&sdata->local->chanctx_mtx);
ret = ieee80211_check_combinations(sdata, NULL, 0, 0);
mutex_unlock(&sdata->local->chanctx_mtx);
if (ret < 0)
return ret;
ret = ieee80211_do_open(wdev, true);
if (ret)
return ret;
ret = drv_start_nan(sdata->local, sdata, conf);
if (ret)
ieee80211_sdata_stop(sdata);
sdata->u.nan.conf = *conf;
return ret;
}
static void ieee80211_stop_nan(struct wiphy *wiphy,
struct wireless_dev *wdev)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
drv_stop_nan(sdata->local, sdata);
ieee80211_sdata_stop(sdata);
}
static int ieee80211_nan_change_conf(struct wiphy *wiphy,
struct wireless_dev *wdev,
struct cfg80211_nan_conf *conf,
u32 changes)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
struct cfg80211_nan_conf new_conf;
int ret = 0;
if (sdata->vif.type != NL80211_IFTYPE_NAN)
return -EOPNOTSUPP;
if (!ieee80211_sdata_running(sdata))
return -ENETDOWN;
new_conf = sdata->u.nan.conf;
if (changes & CFG80211_NAN_CONF_CHANGED_PREF)
new_conf.master_pref = conf->master_pref;
if (changes & CFG80211_NAN_CONF_CHANGED_DUAL)
new_conf.dual = conf->dual;
ret = drv_nan_change_conf(sdata->local, sdata, &new_conf, changes);
if (!ret)
sdata->u.nan.conf = new_conf;
return ret;
}
static int ieee80211_add_nan_func(struct wiphy *wiphy,
struct wireless_dev *wdev,
struct cfg80211_nan_func *nan_func)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
int ret;
if (sdata->vif.type != NL80211_IFTYPE_NAN)
return -EOPNOTSUPP;
if (!ieee80211_sdata_running(sdata))
return -ENETDOWN;
spin_lock_bh(&sdata->u.nan.func_lock);
ret = idr_alloc(&sdata->u.nan.function_inst_ids,
nan_func, 1, sdata->local->hw.max_nan_de_entries + 1,
GFP_ATOMIC);
spin_unlock_bh(&sdata->u.nan.func_lock);
if (ret < 0)
return ret;
nan_func->instance_id = ret;
WARN_ON(nan_func->instance_id == 0);
ret = drv_add_nan_func(sdata->local, sdata, nan_func);
if (ret) {
spin_lock_bh(&sdata->u.nan.func_lock);
idr_remove(&sdata->u.nan.function_inst_ids,
nan_func->instance_id);
spin_unlock_bh(&sdata->u.nan.func_lock);
}
return ret;
}
static struct cfg80211_nan_func *
ieee80211_find_nan_func_by_cookie(struct ieee80211_sub_if_data *sdata,
u64 cookie)
{
struct cfg80211_nan_func *func;
int id;
lockdep_assert_held(&sdata->u.nan.func_lock);
idr_for_each_entry(&sdata->u.nan.function_inst_ids, func, id) {
if (func->cookie == cookie)
return func;
}
return NULL;
}
static void ieee80211_del_nan_func(struct wiphy *wiphy,
struct wireless_dev *wdev, u64 cookie)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
struct cfg80211_nan_func *func;
u8 instance_id = 0;
if (sdata->vif.type != NL80211_IFTYPE_NAN ||
!ieee80211_sdata_running(sdata))
return;
spin_lock_bh(&sdata->u.nan.func_lock);
func = ieee80211_find_nan_func_by_cookie(sdata, cookie);
if (func)
instance_id = func->instance_id;
spin_unlock_bh(&sdata->u.nan.func_lock);
if (instance_id)
drv_del_nan_func(sdata->local, sdata, instance_id);
}
static int ieee80211_set_noack_map(struct wiphy *wiphy, static int ieee80211_set_noack_map(struct wiphy *wiphy,
struct net_device *dev, struct net_device *dev,
u16 noack_map) u16 noack_map)
...@@ -257,6 +401,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, ...@@ -257,6 +401,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
case NL80211_IFTYPE_WDS: case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_MONITOR: case NL80211_IFTYPE_MONITOR:
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_UNSPECIFIED:
case NUM_NL80211_IFTYPES: case NUM_NL80211_IFTYPES:
case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_P2P_CLIENT:
...@@ -2036,6 +2181,7 @@ static int ieee80211_scan(struct wiphy *wiphy, ...@@ -2036,6 +2181,7 @@ static int ieee80211_scan(struct wiphy *wiphy,
!(req->flags & NL80211_SCAN_FLAG_AP))) !(req->flags & NL80211_SCAN_FLAG_AP)))
return -EOPNOTSUPP; return -EOPNOTSUPP;
break; break;
case NL80211_IFTYPE_NAN:
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
...@@ -3377,6 +3523,63 @@ static int ieee80211_del_tx_ts(struct wiphy *wiphy, struct net_device *dev, ...@@ -3377,6 +3523,63 @@ static int ieee80211_del_tx_ts(struct wiphy *wiphy, struct net_device *dev,
return -ENOENT; return -ENOENT;
} }
void ieee80211_nan_func_terminated(struct ieee80211_vif *vif,
u8 inst_id,
enum nl80211_nan_func_term_reason reason,
gfp_t gfp)
{
struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
struct cfg80211_nan_func *func;
u64 cookie;
if (WARN_ON(vif->type != NL80211_IFTYPE_NAN))
return;
spin_lock_bh(&sdata->u.nan.func_lock);
func = idr_find(&sdata->u.nan.function_inst_ids, inst_id);
if (WARN_ON(!func)) {
spin_unlock_bh(&sdata->u.nan.func_lock);
return;
}
cookie = func->cookie;
idr_remove(&sdata->u.nan.function_inst_ids, inst_id);
spin_unlock_bh(&sdata->u.nan.func_lock);
cfg80211_free_nan_func(func);
cfg80211_nan_func_terminated(ieee80211_vif_to_wdev(vif), inst_id,
reason, cookie, gfp);
}
EXPORT_SYMBOL(ieee80211_nan_func_terminated);
void ieee80211_nan_func_match(struct ieee80211_vif *vif,
struct cfg80211_nan_match_params *match,
gfp_t gfp)
{
struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
struct cfg80211_nan_func *func;
if (WARN_ON(vif->type != NL80211_IFTYPE_NAN))
return;
spin_lock_bh(&sdata->u.nan.func_lock);
func = idr_find(&sdata->u.nan.function_inst_ids, match->inst_id);
if (WARN_ON(!func)) {
spin_unlock_bh(&sdata->u.nan.func_lock);
return;
}
match->cookie = func->cookie;
spin_unlock_bh(&sdata->u.nan.func_lock);
cfg80211_nan_match(ieee80211_vif_to_wdev(vif), match, gfp);
}
EXPORT_SYMBOL(ieee80211_nan_func_match);
const struct cfg80211_ops mac80211_config_ops = { const 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,
...@@ -3462,4 +3665,9 @@ const struct cfg80211_ops mac80211_config_ops = { ...@@ -3462,4 +3665,9 @@ const struct cfg80211_ops mac80211_config_ops = {
.set_ap_chanwidth = ieee80211_set_ap_chanwidth, .set_ap_chanwidth = ieee80211_set_ap_chanwidth,
.add_tx_ts = ieee80211_add_tx_ts, .add_tx_ts = ieee80211_add_tx_ts,
.del_tx_ts = ieee80211_del_tx_ts, .del_tx_ts = ieee80211_del_tx_ts,
.start_nan = ieee80211_start_nan,
.stop_nan = ieee80211_stop_nan,
.nan_change_conf = ieee80211_nan_change_conf,
.add_nan_func = ieee80211_add_nan_func,
.del_nan_func = ieee80211_del_nan_func,
}; };
...@@ -274,6 +274,7 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local, ...@@ -274,6 +274,7 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local,
ieee80211_get_max_required_bw(sdata)); ieee80211_get_max_required_bw(sdata));
break; break;
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
continue; continue;
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
case NL80211_IFTYPE_WDS: case NL80211_IFTYPE_WDS:
...@@ -646,6 +647,9 @@ static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata, ...@@ -646,6 +647,9 @@ static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata,
struct ieee80211_chanctx *curr_ctx = NULL; struct ieee80211_chanctx *curr_ctx = NULL;
int ret = 0; int ret = 0;
if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_NAN))
return -ENOTSUPP;
conf = rcu_dereference_protected(sdata->vif.chanctx_conf, conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
lockdep_is_held(&local->chanctx_mtx)); lockdep_is_held(&local->chanctx_mtx));
...@@ -718,6 +722,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, ...@@ -718,6 +722,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
switch (sdata->vif.type) { switch (sdata->vif.type) {
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
continue; continue;
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
if (!sdata->u.mgd.associated) if (!sdata->u.mgd.associated)
...@@ -980,6 +985,7 @@ ieee80211_vif_chanctx_reservation_complete(struct ieee80211_sub_if_data *sdata) ...@@ -980,6 +985,7 @@ ieee80211_vif_chanctx_reservation_complete(struct ieee80211_sub_if_data *sdata)
case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_P2P_CLIENT:
case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_P2P_GO:
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
case NUM_NL80211_IFTYPES: case NUM_NL80211_IFTYPES:
WARN_ON(1); WARN_ON(1);
break; break;
......
...@@ -89,13 +89,19 @@ static ssize_t aqm_read(struct file *file, ...@@ -89,13 +89,19 @@ static ssize_t aqm_read(struct file *file,
"R fq_flows_cnt %u\n" "R fq_flows_cnt %u\n"
"R fq_backlog %u\n" "R fq_backlog %u\n"
"R fq_overlimit %u\n" "R fq_overlimit %u\n"
"R fq_overmemory %u\n"
"R fq_collisions %u\n" "R fq_collisions %u\n"
"R fq_memory_usage %u\n"
"RW fq_memory_limit %u\n"
"RW fq_limit %u\n" "RW fq_limit %u\n"
"RW fq_quantum %u\n", "RW fq_quantum %u\n",
fq->flows_cnt, fq->flows_cnt,
fq->backlog, fq->backlog,
fq->overmemory,
fq->overlimit, fq->overlimit,
fq->collisions, fq->collisions,
fq->memory_usage,
fq->memory_limit,
fq->limit, fq->limit,
fq->quantum); fq->quantum);
...@@ -128,6 +134,8 @@ static ssize_t aqm_write(struct file *file, ...@@ -128,6 +134,8 @@ static ssize_t aqm_write(struct file *file,
if (sscanf(buf, "fq_limit %u", &local->fq.limit) == 1) if (sscanf(buf, "fq_limit %u", &local->fq.limit) == 1)
return count; return count;
else if (sscanf(buf, "fq_memory_limit %u", &local->fq.memory_limit) == 1)
return count;
else if (sscanf(buf, "fq_quantum %u", &local->fq.quantum) == 1) else if (sscanf(buf, "fq_quantum %u", &local->fq.quantum) == 1)
return count; return count;
......
...@@ -556,9 +556,15 @@ static ssize_t ieee80211_if_parse_tsf( ...@@ -556,9 +556,15 @@ static ssize_t ieee80211_if_parse_tsf(
ret = kstrtoull(buf, 10, &tsf); ret = kstrtoull(buf, 10, &tsf);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (tsf_is_delta) if (tsf_is_delta && local->ops->offset_tsf) {
tsf = drv_get_tsf(local, sdata) + tsf_is_delta * tsf; drv_offset_tsf(local, sdata, tsf_is_delta * tsf);
if (local->ops->set_tsf) { wiphy_info(local->hw.wiphy,
"debugfs offset TSF by %018lld\n",
tsf_is_delta * tsf);
} else if (local->ops->set_tsf) {
if (tsf_is_delta)
tsf = drv_get_tsf(local, sdata) +
tsf_is_delta * tsf;
drv_set_tsf(local, sdata, tsf); drv_set_tsf(local, sdata, tsf);
wiphy_info(local->hw.wiphy, wiphy_info(local->hw.wiphy,
"debugfs set TSF to %#018llx\n", tsf); "debugfs set TSF to %#018llx\n", tsf);
......
...@@ -215,6 +215,21 @@ void drv_set_tsf(struct ieee80211_local *local, ...@@ -215,6 +215,21 @@ void drv_set_tsf(struct ieee80211_local *local,
trace_drv_return_void(local); trace_drv_return_void(local);
} }
void drv_offset_tsf(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
s64 offset)
{
might_sleep();
if (!check_sdata_in_driver(sdata))
return;
trace_drv_offset_tsf(local, sdata, offset);
if (local->ops->offset_tsf)
local->ops->offset_tsf(&local->hw, &sdata->vif, offset);
trace_drv_return_void(local);
}
void drv_reset_tsf(struct ieee80211_local *local, void drv_reset_tsf(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata) struct ieee80211_sub_if_data *sdata)
{ {
......
...@@ -162,6 +162,7 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local, ...@@ -162,6 +162,7 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
return; return;
if (WARN_ON_ONCE(sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE || if (WARN_ON_ONCE(sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE ||
sdata->vif.type == NL80211_IFTYPE_NAN ||
(sdata->vif.type == NL80211_IFTYPE_MONITOR && (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
!sdata->vif.mu_mimo_owner))) !sdata->vif.mu_mimo_owner)))
return; return;
...@@ -568,6 +569,9 @@ u64 drv_get_tsf(struct ieee80211_local *local, ...@@ -568,6 +569,9 @@ u64 drv_get_tsf(struct ieee80211_local *local,
void drv_set_tsf(struct ieee80211_local *local, void drv_set_tsf(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata, struct ieee80211_sub_if_data *sdata,
u64 tsf); u64 tsf);
void drv_offset_tsf(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
s64 offset);
void drv_reset_tsf(struct ieee80211_local *local, void drv_reset_tsf(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata); struct ieee80211_sub_if_data *sdata);
...@@ -1165,4 +1169,83 @@ static inline void drv_wake_tx_queue(struct ieee80211_local *local, ...@@ -1165,4 +1169,83 @@ static inline void drv_wake_tx_queue(struct ieee80211_local *local,
local->ops->wake_tx_queue(&local->hw, &txq->txq); local->ops->wake_tx_queue(&local->hw, &txq->txq);
} }
static inline int drv_start_nan(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
struct cfg80211_nan_conf *conf)
{
int ret;
might_sleep();
check_sdata_in_driver(sdata);
trace_drv_start_nan(local, sdata, conf);
ret = local->ops->start_nan(&local->hw, &sdata->vif, conf);
trace_drv_return_int(local, ret);
return ret;
}
static inline void drv_stop_nan(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata)
{
might_sleep();
check_sdata_in_driver(sdata);
trace_drv_stop_nan(local, sdata);
local->ops->stop_nan(&local->hw, &sdata->vif);
trace_drv_return_void(local);
}
static inline int drv_nan_change_conf(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
struct cfg80211_nan_conf *conf,
u32 changes)
{
int ret;
might_sleep();
check_sdata_in_driver(sdata);
if (!local->ops->nan_change_conf)
return -EOPNOTSUPP;
trace_drv_nan_change_conf(local, sdata, conf, changes);
ret = local->ops->nan_change_conf(&local->hw, &sdata->vif, conf,
changes);
trace_drv_return_int(local, ret);
return ret;
}
static inline int drv_add_nan_func(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
const struct cfg80211_nan_func *nan_func)
{
int ret;
might_sleep();
check_sdata_in_driver(sdata);
if (!local->ops->add_nan_func)
return -EOPNOTSUPP;
trace_drv_add_nan_func(local, sdata, nan_func);
ret = local->ops->add_nan_func(&local->hw, &sdata->vif, nan_func);
trace_drv_return_int(local, ret);
return ret;
}
static inline void drv_del_nan_func(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
u8 instance_id)
{
might_sleep();
check_sdata_in_driver(sdata);
trace_drv_del_nan_func(local, sdata, instance_id);
if (local->ops->del_nan_func)
local->ops->del_nan_func(&local->hw, &sdata->vif, instance_id);
trace_drv_return_void(local);
}
#endif /* __MAC80211_DRIVER_OPS */ #endif /* __MAC80211_DRIVER_OPS */
...@@ -86,6 +86,8 @@ struct ieee80211_local; ...@@ -86,6 +86,8 @@ struct ieee80211_local;
#define IEEE80211_DEAUTH_FRAME_LEN (24 /* hdr */ + 2 /* reason */) #define IEEE80211_DEAUTH_FRAME_LEN (24 /* hdr */ + 2 /* reason */)
#define IEEE80211_MAX_NAN_INSTANCE_ID 255
struct ieee80211_fragment_entry { struct ieee80211_fragment_entry {
struct sk_buff_head skb_list; struct sk_buff_head skb_list;
unsigned long first_frag_time; unsigned long first_frag_time;
...@@ -813,12 +815,14 @@ enum txq_info_flags { ...@@ -813,12 +815,14 @@ enum txq_info_flags {
* @def_flow: used as a fallback flow when a packet destined to @tin hashes to * @def_flow: used as a fallback flow when a packet destined to @tin hashes to
* a fq_flow which is already owned by a different tin * a fq_flow which is already owned by a different tin
* @def_cvars: codel vars for @def_flow * @def_cvars: codel vars for @def_flow
* @frags: used to keep fragments created after dequeue
*/ */
struct txq_info { struct txq_info {
struct fq_tin tin; struct fq_tin tin;
struct fq_flow def_flow; struct fq_flow def_flow;
struct codel_vars def_cvars; struct codel_vars def_cvars;
struct codel_stats cstats; struct codel_stats cstats;
struct sk_buff_head frags;
unsigned long flags; unsigned long flags;
/* keep last! */ /* keep last! */
...@@ -830,6 +834,20 @@ struct ieee80211_if_mntr { ...@@ -830,6 +834,20 @@ struct ieee80211_if_mntr {
u8 mu_follow_addr[ETH_ALEN] __aligned(2); u8 mu_follow_addr[ETH_ALEN] __aligned(2);
}; };
/**
* struct ieee80211_if_nan - NAN state
*
* @conf: current NAN configuration
* @func_ids: a bitmap of available instance_id's
*/
struct ieee80211_if_nan {
struct cfg80211_nan_conf conf;
/* protects function_inst_ids */
spinlock_t func_lock;
struct idr function_inst_ids;
};
struct ieee80211_sub_if_data { struct ieee80211_sub_if_data {
struct list_head list; struct list_head list;
...@@ -929,6 +947,7 @@ struct ieee80211_sub_if_data { ...@@ -929,6 +947,7 @@ struct ieee80211_sub_if_data {
struct ieee80211_if_mesh mesh; struct ieee80211_if_mesh mesh;
struct ieee80211_if_ocb ocb; struct ieee80211_if_ocb ocb;
struct ieee80211_if_mntr mntr; struct ieee80211_if_mntr mntr;
struct ieee80211_if_nan nan;
} u; } u;
#ifdef CONFIG_MAC80211_DEBUGFS #ifdef CONFIG_MAC80211_DEBUGFS
...@@ -1481,6 +1500,13 @@ static inline struct txq_info *to_txq_info(struct ieee80211_txq *txq) ...@@ -1481,6 +1500,13 @@ static inline struct txq_info *to_txq_info(struct ieee80211_txq *txq)
return container_of(txq, struct txq_info, txq); return container_of(txq, struct txq_info, txq);
} }
static inline bool txq_has_queue(struct ieee80211_txq *txq)
{
struct txq_info *txqi = to_txq_info(txq);
return !(skb_queue_empty(&txqi->frags) && !txqi->tin.backlog_packets);
}
static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr) static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
{ {
return ether_addr_equal(raddr, addr) || return ether_addr_equal(raddr, addr) ||
......
...@@ -327,6 +327,9 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata, ...@@ -327,6 +327,9 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata,
int n_queues = sdata->local->hw.queues; int n_queues = sdata->local->hw.queues;
int i; int i;
if (iftype == NL80211_IFTYPE_NAN)
return 0;
if (iftype != NL80211_IFTYPE_P2P_DEVICE) { if (iftype != NL80211_IFTYPE_P2P_DEVICE) {
for (i = 0; i < IEEE80211_NUM_ACS; i++) { for (i = 0; i < IEEE80211_NUM_ACS; i++) {
if (WARN_ON_ONCE(sdata->vif.hw_queue[i] == if (WARN_ON_ONCE(sdata->vif.hw_queue[i] ==
...@@ -545,6 +548,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) ...@@ -545,6 +548,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_OCB: case NL80211_IFTYPE_OCB:
case NL80211_IFTYPE_NAN:
/* no special treatment */ /* no special treatment */
break; break;
case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_UNSPECIFIED:
...@@ -646,7 +650,8 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) ...@@ -646,7 +650,8 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
local->fif_probe_req++; local->fif_probe_req++;
} }
if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE &&
sdata->vif.type != NL80211_IFTYPE_NAN)
changed |= ieee80211_reset_erp_info(sdata); changed |= ieee80211_reset_erp_info(sdata);
ieee80211_bss_info_change_notify(sdata, changed); ieee80211_bss_info_change_notify(sdata, changed);
...@@ -660,6 +665,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) ...@@ -660,6 +665,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
break; break;
case NL80211_IFTYPE_WDS: case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
break; break;
default: default:
/* not reached */ /* not reached */
...@@ -792,6 +798,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ...@@ -792,6 +798,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
struct ps_data *ps; struct ps_data *ps;
struct cfg80211_chan_def chandef; struct cfg80211_chan_def chandef;
bool cancel_scan; bool cancel_scan;
struct cfg80211_nan_func *func;
clear_bit(SDATA_STATE_RUNNING, &sdata->state); clear_bit(SDATA_STATE_RUNNING, &sdata->state);
...@@ -944,6 +951,18 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ...@@ -944,6 +951,18 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
ieee80211_adjust_monitor_flags(sdata, -1); ieee80211_adjust_monitor_flags(sdata, -1);
break; break;
case NL80211_IFTYPE_NAN:
/* clean all the functions */
spin_lock_bh(&sdata->u.nan.func_lock);
idr_for_each_entry(&sdata->u.nan.function_inst_ids, func, i) {
idr_remove(&sdata->u.nan.function_inst_ids, i);
cfg80211_free_nan_func(func);
}
idr_destroy(&sdata->u.nan.function_inst_ids);
spin_unlock_bh(&sdata->u.nan.func_lock);
break;
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
/* relies on synchronize_rcu() below */ /* relies on synchronize_rcu() below */
RCU_INIT_POINTER(local->p2p_sdata, NULL); RCU_INIT_POINTER(local->p2p_sdata, NULL);
...@@ -1455,6 +1474,11 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, ...@@ -1455,6 +1474,11 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
case NL80211_IFTYPE_WDS: case NL80211_IFTYPE_WDS:
sdata->vif.bss_conf.bssid = NULL; sdata->vif.bss_conf.bssid = NULL;
break; break;
case NL80211_IFTYPE_NAN:
idr_init(&sdata->u.nan.function_inst_ids);
spin_lock_init(&sdata->u.nan.func_lock);
sdata->vif.bss_conf.bssid = sdata->vif.addr;
break;
case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
sdata->vif.bss_conf.bssid = sdata->vif.addr; sdata->vif.bss_conf.bssid = sdata->vif.addr;
...@@ -1722,7 +1746,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, ...@@ -1722,7 +1746,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
ASSERT_RTNL(); ASSERT_RTNL();
if (type == NL80211_IFTYPE_P2P_DEVICE) { if (type == NL80211_IFTYPE_P2P_DEVICE || type == NL80211_IFTYPE_NAN) {
struct wireless_dev *wdev; struct wireless_dev *wdev;
sdata = kzalloc(sizeof(*sdata) + local->hw.vif_data_size, sdata = kzalloc(sizeof(*sdata) + local->hw.vif_data_size,
......
...@@ -821,6 +821,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ...@@ -821,6 +821,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
!local->ops->tdls_recv_channel_switch)) !local->ops->tdls_recv_channel_switch))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (WARN_ON(local->hw.wiphy->interface_modes &
BIT(NL80211_IFTYPE_NAN) &&
(!local->ops->start_nan || !local->ops->stop_nan)))
return -EINVAL;
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (hw->wiphy->wowlan && (!local->ops->suspend || !local->ops->resume)) if (hw->wiphy->wowlan && (!local->ops->suspend || !local->ops->resume))
return -EINVAL; return -EINVAL;
...@@ -1058,6 +1063,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ...@@ -1058,6 +1063,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
local->dynamic_ps_forced_timeout = -1; local->dynamic_ps_forced_timeout = -1;
if (!local->hw.max_nan_de_entries)
local->hw.max_nan_de_entries = IEEE80211_MAX_NAN_INSTANCE_ID;
result = ieee80211_wep_init(local); result = ieee80211_wep_init(local);
if (result < 0) if (result < 0)
wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n", wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* could be, for instance, in case a neighbor is restarted and its TSF counter * could be, for instance, in case a neighbor is restarted and its TSF counter
* reset. * reset.
*/ */
#define TOFFSET_MAXIMUM_ADJUSTMENT 30000 /* 30 ms */ #define TOFFSET_MAXIMUM_ADJUSTMENT 800 /* 0.8 ms */
struct sync_method { struct sync_method {
u8 method; u8 method;
...@@ -70,9 +70,13 @@ void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata) ...@@ -70,9 +70,13 @@ void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
} }
spin_unlock_bh(&ifmsh->sync_offset_lock); spin_unlock_bh(&ifmsh->sync_offset_lock);
tsf = drv_get_tsf(local, sdata); if (local->ops->offset_tsf) {
if (tsf != -1ULL) drv_offset_tsf(local, sdata, tsfdelta);
drv_set_tsf(local, sdata, tsf + tsfdelta); } else {
tsf = drv_get_tsf(local, sdata);
if (tsf != -1ULL)
drv_set_tsf(local, sdata, tsf + tsfdelta);
}
} }
static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
......
...@@ -128,7 +128,8 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local) ...@@ -128,7 +128,8 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local)
if (!ieee80211_sdata_running(sdata)) if (!ieee80211_sdata_running(sdata))
continue; continue;
if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE ||
sdata->vif.type == NL80211_IFTYPE_NAN)
continue; continue;
if (sdata->vif.type != NL80211_IFTYPE_MONITOR) if (sdata->vif.type != NL80211_IFTYPE_MONITOR)
...@@ -838,6 +839,7 @@ int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, ...@@ -838,6 +839,7 @@ int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
need_offchan = true; need_offchan = true;
break; break;
case NL80211_IFTYPE_NAN:
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
...@@ -1323,9 +1323,7 @@ static void sta_ps_start(struct sta_info *sta) ...@@ -1323,9 +1323,7 @@ static void sta_ps_start(struct sta_info *sta)
return; return;
for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) { for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]); if (txq_has_queue(sta->sta.txq[tid]))
if (txqi->tin.backlog_packets)
set_bit(tid, &sta->txq_buffered_tids); set_bit(tid, &sta->txq_buffered_tids);
else else
clear_bit(tid, &sta->txq_buffered_tids); clear_bit(tid, &sta->txq_buffered_tids);
...@@ -3586,6 +3584,9 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx) ...@@ -3586,6 +3584,9 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
ieee80211_is_probe_req(hdr->frame_control) || ieee80211_is_probe_req(hdr->frame_control) ||
ieee80211_is_probe_resp(hdr->frame_control) || ieee80211_is_probe_resp(hdr->frame_control) ||
ieee80211_is_beacon(hdr->frame_control); ieee80211_is_beacon(hdr->frame_control);
case NL80211_IFTYPE_NAN:
/* Currently no frames on NAN interface are allowed */
return false;
default: default:
break; break;
} }
......
...@@ -1202,12 +1202,10 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) ...@@ -1202,12 +1202,10 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
if (sta->sta.txq[0]) { if (sta->sta.txq[0]) {
for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) {
struct txq_info *txqi = to_txq_info(sta->sta.txq[i]); if (!txq_has_queue(sta->sta.txq[i]))
if (!txqi->tin.backlog_packets)
continue; continue;
drv_wake_tx_queue(local, txqi); drv_wake_tx_queue(local, to_txq_info(sta->sta.txq[i]));
} }
} }
...@@ -1638,10 +1636,8 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta, ...@@ -1638,10 +1636,8 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
return; return;
for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) { for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]);
if (!(driver_release_tids & BIT(tid)) || if (!(driver_release_tids & BIT(tid)) ||
txqi->tin.backlog_packets) txq_has_queue(sta->sta.txq[tid]))
continue; continue;
sta_info_recalc_tim(sta); sta_info_recalc_tim(sta);
......
...@@ -984,6 +984,32 @@ TRACE_EVENT(drv_set_tsf, ...@@ -984,6 +984,32 @@ TRACE_EVENT(drv_set_tsf,
) )
); );
TRACE_EVENT(drv_offset_tsf,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
s64 offset),
TP_ARGS(local, sdata, offset),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
__field(s64, tsf_offset)
),
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
__entry->tsf_offset = offset;
),
TP_printk(
LOCAL_PR_FMT VIF_PR_FMT " tsf offset:%lld",
LOCAL_PR_ARG, VIF_PR_ARG,
(unsigned long long)__entry->tsf_offset
)
);
DEFINE_EVENT(local_sdata_evt, drv_reset_tsf, DEFINE_EVENT(local_sdata_evt, drv_reset_tsf,
TP_PROTO(struct ieee80211_local *local, TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata), struct ieee80211_sub_if_data *sdata),
...@@ -1700,6 +1726,139 @@ TRACE_EVENT(drv_get_expected_throughput, ...@@ -1700,6 +1726,139 @@ TRACE_EVENT(drv_get_expected_throughput,
) )
); );
TRACE_EVENT(drv_start_nan,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
struct cfg80211_nan_conf *conf),
TP_ARGS(local, sdata, conf),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
__field(u8, master_pref)
__field(u8, dual)
),
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
__entry->master_pref = conf->master_pref;
__entry->dual = conf->dual;
),
TP_printk(
LOCAL_PR_FMT VIF_PR_FMT
", master preference: %u, dual: %d",
LOCAL_PR_ARG, VIF_PR_ARG, __entry->master_pref,
__entry->dual
)
);
TRACE_EVENT(drv_stop_nan,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata),
TP_ARGS(local, sdata),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
),
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
),
TP_printk(
LOCAL_PR_FMT VIF_PR_FMT,
LOCAL_PR_ARG, VIF_PR_ARG
)
);
TRACE_EVENT(drv_nan_change_conf,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
struct cfg80211_nan_conf *conf,
u32 changes),
TP_ARGS(local, sdata, conf, changes),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
__field(u8, master_pref)
__field(u8, dual)
__field(u32, changes)
),
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
__entry->master_pref = conf->master_pref;
__entry->dual = conf->dual;
__entry->changes = changes;
),
TP_printk(
LOCAL_PR_FMT VIF_PR_FMT
", master preference: %u, dual: %d, changes: 0x%x",
LOCAL_PR_ARG, VIF_PR_ARG, __entry->master_pref,
__entry->dual, __entry->changes
)
);
TRACE_EVENT(drv_add_nan_func,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
const struct cfg80211_nan_func *func),
TP_ARGS(local, sdata, func),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
__field(u8, type)
__field(u8, inst_id)
),
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
__entry->type = func->type;
__entry->inst_id = func->instance_id;
),
TP_printk(
LOCAL_PR_FMT VIF_PR_FMT
", type: %u, inst_id: %u",
LOCAL_PR_ARG, VIF_PR_ARG, __entry->type, __entry->inst_id
)
);
TRACE_EVENT(drv_del_nan_func,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
u8 instance_id),
TP_ARGS(local, sdata, instance_id),
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
__field(u8, instance_id)
),
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
__entry->instance_id = instance_id;
),
TP_printk(
LOCAL_PR_FMT VIF_PR_FMT
", instance_id: %u",
LOCAL_PR_ARG, VIF_PR_ARG, __entry->instance_id
)
);
/* /*
* Tracing for API calls that drivers call. * Tracing for API calls that drivers call.
*/ */
......
This diff is collapsed.
...@@ -1209,7 +1209,8 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata, ...@@ -1209,7 +1209,8 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
} }
if (sdata->vif.type != NL80211_IFTYPE_MONITOR && if (sdata->vif.type != NL80211_IFTYPE_MONITOR &&
sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) { sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE &&
sdata->vif.type != NL80211_IFTYPE_NAN) {
sdata->vif.bss_conf.qos = enable_qos; sdata->vif.bss_conf.qos = enable_qos;
if (bss_notify) if (bss_notify)
ieee80211_bss_info_change_notify(sdata, ieee80211_bss_info_change_notify(sdata,
...@@ -1748,6 +1749,46 @@ static void ieee80211_reconfig_stations(struct ieee80211_sub_if_data *sdata) ...@@ -1748,6 +1749,46 @@ static void ieee80211_reconfig_stations(struct ieee80211_sub_if_data *sdata)
mutex_unlock(&local->sta_mtx); mutex_unlock(&local->sta_mtx);
} }
static int ieee80211_reconfig_nan(struct ieee80211_sub_if_data *sdata)
{
struct cfg80211_nan_func *func, **funcs;
int res, id, i = 0;
res = drv_start_nan(sdata->local, sdata,
&sdata->u.nan.conf);
if (WARN_ON(res))
return res;
funcs = kzalloc((sdata->local->hw.max_nan_de_entries + 1) *
sizeof(*funcs), GFP_KERNEL);
if (!funcs)
return -ENOMEM;
/* Add all the functions:
* This is a little bit ugly. We need to call a potentially sleeping
* callback for each NAN function, so we can't hold the spinlock.
*/
spin_lock_bh(&sdata->u.nan.func_lock);
idr_for_each_entry(&sdata->u.nan.function_inst_ids, func, id)
funcs[i++] = func;
spin_unlock_bh(&sdata->u.nan.func_lock);
for (i = 0; funcs[i]; i++) {
res = drv_add_nan_func(sdata->local, sdata, funcs[i]);
if (WARN_ON(res))
ieee80211_nan_func_terminated(&sdata->vif,
funcs[i]->instance_id,
NL80211_NAN_FUNC_TERM_REASON_ERROR,
GFP_KERNEL);
}
kfree(funcs);
return 0;
}
int ieee80211_reconfig(struct ieee80211_local *local) int ieee80211_reconfig(struct ieee80211_local *local)
{ {
struct ieee80211_hw *hw = &local->hw; struct ieee80211_hw *hw = &local->hw;
...@@ -1971,6 +2012,13 @@ int ieee80211_reconfig(struct ieee80211_local *local) ...@@ -1971,6 +2012,13 @@ int ieee80211_reconfig(struct ieee80211_local *local)
ieee80211_bss_info_change_notify(sdata, changed); ieee80211_bss_info_change_notify(sdata, changed);
} }
break; break;
case NL80211_IFTYPE_NAN:
res = ieee80211_reconfig_nan(sdata);
if (res < 0) {
ieee80211_handle_reconfig_failure(local);
return res;
}
break;
case NL80211_IFTYPE_WDS: case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_MONITOR: case NL80211_IFTYPE_MONITOR:
...@@ -3393,11 +3441,18 @@ void ieee80211_txq_get_depth(struct ieee80211_txq *txq, ...@@ -3393,11 +3441,18 @@ void ieee80211_txq_get_depth(struct ieee80211_txq *txq,
unsigned long *byte_cnt) unsigned long *byte_cnt)
{ {
struct txq_info *txqi = to_txq_info(txq); struct txq_info *txqi = to_txq_info(txq);
u32 frag_cnt = 0, frag_bytes = 0;
struct sk_buff *skb;
skb_queue_walk(&txqi->frags, skb) {
frag_cnt++;
frag_bytes += skb->len;
}
if (frame_cnt) if (frame_cnt)
*frame_cnt = txqi->tin.backlog_packets; *frame_cnt = txqi->tin.backlog_packets + frag_cnt;
if (byte_cnt) if (byte_cnt)
*byte_cnt = txqi->tin.backlog_bytes; *byte_cnt = txqi->tin.backlog_bytes + frag_bytes;
} }
EXPORT_SYMBOL(ieee80211_txq_get_depth); EXPORT_SYMBOL(ieee80211_txq_get_depth);
...@@ -372,6 +372,7 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy, ...@@ -372,6 +372,7 @@ int cfg80211_chandef_dfs_required(struct wiphy *wiphy,
case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_WDS: case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
break; break;
case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_UNSPECIFIED:
case NUM_NL80211_IFTYPES: case NUM_NL80211_IFTYPES:
...@@ -946,6 +947,7 @@ cfg80211_get_chan_state(struct wireless_dev *wdev, ...@@ -946,6 +947,7 @@ cfg80211_get_chan_state(struct wireless_dev *wdev,
case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_WDS: case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
/* these interface types don't really have a channel */ /* these interface types don't really have a channel */
return; return;
case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_UNSPECIFIED:
......
...@@ -225,6 +225,23 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, ...@@ -225,6 +225,23 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
} }
} }
void cfg80211_stop_nan(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev)
{
ASSERT_RTNL();
if (WARN_ON(wdev->iftype != NL80211_IFTYPE_NAN))
return;
if (!wdev->nan_started)
return;
rdev_stop_nan(rdev, wdev);
wdev->nan_started = false;
rdev->opencount--;
}
void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy) void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy)
{ {
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
...@@ -242,6 +259,9 @@ void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy) ...@@ -242,6 +259,9 @@ void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy)
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
cfg80211_stop_p2p_device(rdev, wdev); cfg80211_stop_p2p_device(rdev, wdev);
break; break;
case NL80211_IFTYPE_NAN:
cfg80211_stop_nan(rdev, wdev);
break;
default: default:
break; break;
} }
...@@ -537,6 +557,11 @@ static int wiphy_verify_combinations(struct wiphy *wiphy) ...@@ -537,6 +557,11 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
c->limits[j].max > 1)) c->limits[j].max > 1))
return -EINVAL; return -EINVAL;
/* Only a single NAN can be allowed */
if (WARN_ON(types & BIT(NL80211_IFTYPE_NAN) &&
c->limits[j].max > 1))
return -EINVAL;
cnt += c->limits[j].max; cnt += c->limits[j].max;
/* /*
* Don't advertise an unsupported type * Don't advertise an unsupported type
...@@ -579,6 +604,11 @@ int wiphy_register(struct wiphy *wiphy) ...@@ -579,6 +604,11 @@ int wiphy_register(struct wiphy *wiphy)
!rdev->ops->tdls_cancel_channel_switch))) !rdev->ops->tdls_cancel_channel_switch)))
return -EINVAL; return -EINVAL;
if (WARN_ON((wiphy->interface_modes & BIT(NL80211_IFTYPE_NAN)) &&
(!rdev->ops->start_nan || !rdev->ops->stop_nan ||
!rdev->ops->add_nan_func || !rdev->ops->del_nan_func)))
return -EINVAL;
/* /*
* if a wiphy has unsupported modes for regulatory channel enforcement, * if a wiphy has unsupported modes for regulatory channel enforcement,
* opt-out of enforcement checking * opt-out of enforcement checking
...@@ -589,6 +619,7 @@ int wiphy_register(struct wiphy *wiphy) ...@@ -589,6 +619,7 @@ int wiphy_register(struct wiphy *wiphy)
BIT(NL80211_IFTYPE_P2P_GO) | BIT(NL80211_IFTYPE_P2P_GO) |
BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_ADHOC) |
BIT(NL80211_IFTYPE_P2P_DEVICE) | BIT(NL80211_IFTYPE_P2P_DEVICE) |
BIT(NL80211_IFTYPE_NAN) |
BIT(NL80211_IFTYPE_AP_VLAN) | BIT(NL80211_IFTYPE_AP_VLAN) |
BIT(NL80211_IFTYPE_MONITOR))) BIT(NL80211_IFTYPE_MONITOR)))
wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF; wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
...@@ -916,6 +947,9 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev) ...@@ -916,6 +947,9 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev)
cfg80211_mlme_purge_registrations(wdev); cfg80211_mlme_purge_registrations(wdev);
cfg80211_stop_p2p_device(rdev, wdev); cfg80211_stop_p2p_device(rdev, wdev);
break; break;
case NL80211_IFTYPE_NAN:
cfg80211_stop_nan(rdev, wdev);
break;
default: default:
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
break; break;
...@@ -979,6 +1013,7 @@ void __cfg80211_leave(struct cfg80211_registered_device *rdev, ...@@ -979,6 +1013,7 @@ void __cfg80211_leave(struct cfg80211_registered_device *rdev,
/* must be handled by mac80211/driver, has no APIs */ /* must be handled by mac80211/driver, has no APIs */
break; break;
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
/* cannot happen, has no netdev */ /* cannot happen, has no netdev */
break; break;
case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP_VLAN:
......
...@@ -249,8 +249,8 @@ struct cfg80211_event { ...@@ -249,8 +249,8 @@ struct cfg80211_event {
}; };
struct cfg80211_cached_keys { struct cfg80211_cached_keys {
struct key_params params[4]; struct key_params params[CFG80211_MAX_WEP_KEYS];
u8 data[4][WLAN_KEY_LEN_WEP104]; u8 data[CFG80211_MAX_WEP_KEYS][WLAN_KEY_LEN_WEP104];
int def; int def;
}; };
...@@ -488,6 +488,9 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev, ...@@ -488,6 +488,9 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev,
void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev); struct wireless_dev *wdev);
void cfg80211_stop_nan(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev);
#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10 #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
#ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS
......
...@@ -43,7 +43,8 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, ...@@ -43,7 +43,8 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
cfg80211_hold_bss(bss_from_pub(bss)); cfg80211_hold_bss(bss_from_pub(bss));
wdev->current_bss = bss_from_pub(bss); wdev->current_bss = bss_from_pub(bss);
cfg80211_upload_connect_keys(wdev); if (!(wdev->wiphy->flags & WIPHY_FLAG_HAS_STATIC_WEP))
cfg80211_upload_connect_keys(wdev);
nl80211_send_ibss_bssid(wiphy_to_rdev(wdev->wiphy), dev, bssid, nl80211_send_ibss_bssid(wiphy_to_rdev(wdev->wiphy), dev, bssid,
GFP_KERNEL); GFP_KERNEL);
...@@ -296,7 +297,7 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev, ...@@ -296,7 +297,7 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL); ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
if (!ck) if (!ck)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < 4; i++) for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
ck->params[i].key = ck->data[i]; ck->params[i].key = ck->data[i];
} }
err = __cfg80211_join_ibss(rdev, wdev->netdev, err = __cfg80211_join_ibss(rdev, wdev->netdev,
......
...@@ -634,6 +634,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, ...@@ -634,6 +634,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev,
* fall through, P2P device only supports * fall through, P2P device only supports
* public action frames * public action frames
*/ */
case NL80211_IFTYPE_NAN:
default: default:
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
break; break;
......
This diff is collapsed.
...@@ -887,6 +887,64 @@ static inline void rdev_stop_p2p_device(struct cfg80211_registered_device *rdev, ...@@ -887,6 +887,64 @@ static inline void rdev_stop_p2p_device(struct cfg80211_registered_device *rdev,
trace_rdev_return_void(&rdev->wiphy); trace_rdev_return_void(&rdev->wiphy);
} }
static inline int rdev_start_nan(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev,
struct cfg80211_nan_conf *conf)
{
int ret;
trace_rdev_start_nan(&rdev->wiphy, wdev, conf);
ret = rdev->ops->start_nan(&rdev->wiphy, wdev, conf);
trace_rdev_return_int(&rdev->wiphy, ret);
return ret;
}
static inline void rdev_stop_nan(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev)
{
trace_rdev_stop_nan(&rdev->wiphy, wdev);
rdev->ops->stop_nan(&rdev->wiphy, wdev);
trace_rdev_return_void(&rdev->wiphy);
}
static inline int
rdev_add_nan_func(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev,
struct cfg80211_nan_func *nan_func)
{
int ret;
trace_rdev_add_nan_func(&rdev->wiphy, wdev, nan_func);
ret = rdev->ops->add_nan_func(&rdev->wiphy, wdev, nan_func);
trace_rdev_return_int(&rdev->wiphy, ret);
return ret;
}
static inline void rdev_del_nan_func(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev, u64 cookie)
{
trace_rdev_del_nan_func(&rdev->wiphy, wdev, cookie);
rdev->ops->del_nan_func(&rdev->wiphy, wdev, cookie);
trace_rdev_return_void(&rdev->wiphy);
}
static inline int
rdev_nan_change_conf(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev,
struct cfg80211_nan_conf *conf, u32 changes)
{
int ret;
trace_rdev_nan_change_conf(&rdev->wiphy, wdev, conf, changes);
if (rdev->ops->nan_change_conf)
ret = rdev->ops->nan_change_conf(&rdev->wiphy, wdev, conf,
changes);
else
ret = -ENOTSUPP;
trace_rdev_return_int(&rdev->wiphy, ret);
return ret;
}
static inline int rdev_set_mac_acl(struct cfg80211_registered_device *rdev, static inline int rdev_set_mac_acl(struct cfg80211_registered_device *rdev,
struct net_device *dev, struct net_device *dev,
struct cfg80211_acl_data *params) struct cfg80211_acl_data *params)
......
...@@ -726,7 +726,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, ...@@ -726,7 +726,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
wdev->current_bss = bss_from_pub(bss); wdev->current_bss = bss_from_pub(bss);
cfg80211_upload_connect_keys(wdev); if (!(wdev->wiphy->flags & WIPHY_FLAG_HAS_STATIC_WEP))
cfg80211_upload_connect_keys(wdev);
rcu_read_lock(); rcu_read_lock();
country_ie = ieee80211_bss_get_ie(bss, WLAN_EID_COUNTRY); country_ie = ieee80211_bss_get_ie(bss, WLAN_EID_COUNTRY);
...@@ -1043,6 +1044,9 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, ...@@ -1043,6 +1044,9 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
connect->crypto.ciphers_pairwise[0] = cipher; connect->crypto.ciphers_pairwise[0] = cipher;
} }
} }
connect->crypto.wep_keys = connkeys->params;
connect->crypto.wep_tx_key = connkeys->def;
} else { } else {
if (WARN_ON(connkeys)) if (WARN_ON(connkeys))
return -EINVAL; return -EINVAL;
......
...@@ -1889,6 +1889,96 @@ DEFINE_EVENT(wiphy_wdev_evt, rdev_stop_p2p_device, ...@@ -1889,6 +1889,96 @@ DEFINE_EVENT(wiphy_wdev_evt, rdev_stop_p2p_device,
TP_ARGS(wiphy, wdev) TP_ARGS(wiphy, wdev)
); );
TRACE_EVENT(rdev_start_nan,
TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
struct cfg80211_nan_conf *conf),
TP_ARGS(wiphy, wdev, conf),
TP_STRUCT__entry(
WIPHY_ENTRY
WDEV_ENTRY
__field(u8, master_pref)
__field(u8, dual);
),
TP_fast_assign(
WIPHY_ASSIGN;
WDEV_ASSIGN;
__entry->master_pref = conf->master_pref;
__entry->dual = conf->dual;
),
TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT
", master preference: %u, dual: %d",
WIPHY_PR_ARG, WDEV_PR_ARG, __entry->master_pref,
__entry->dual)
);
TRACE_EVENT(rdev_nan_change_conf,
TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
struct cfg80211_nan_conf *conf, u32 changes),
TP_ARGS(wiphy, wdev, conf, changes),
TP_STRUCT__entry(
WIPHY_ENTRY
WDEV_ENTRY
__field(u8, master_pref)
__field(u8, dual);
__field(u32, changes);
),
TP_fast_assign(
WIPHY_ASSIGN;
WDEV_ASSIGN;
__entry->master_pref = conf->master_pref;
__entry->dual = conf->dual;
__entry->changes = changes;
),
TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT
", master preference: %u, dual: %d, changes: %x",
WIPHY_PR_ARG, WDEV_PR_ARG, __entry->master_pref,
__entry->dual, __entry->changes)
);
DEFINE_EVENT(wiphy_wdev_evt, rdev_stop_nan,
TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev),
TP_ARGS(wiphy, wdev)
);
TRACE_EVENT(rdev_add_nan_func,
TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
const struct cfg80211_nan_func *func),
TP_ARGS(wiphy, wdev, func),
TP_STRUCT__entry(
WIPHY_ENTRY
WDEV_ENTRY
__field(u8, func_type)
__field(u64, cookie)
),
TP_fast_assign(
WIPHY_ASSIGN;
WDEV_ASSIGN;
__entry->func_type = func->type;
__entry->cookie = func->cookie
),
TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", type=%u, cookie=%llu",
WIPHY_PR_ARG, WDEV_PR_ARG, __entry->func_type,
__entry->cookie)
);
TRACE_EVENT(rdev_del_nan_func,
TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
u64 cookie),
TP_ARGS(wiphy, wdev, cookie),
TP_STRUCT__entry(
WIPHY_ENTRY
WDEV_ENTRY
__field(u64, cookie)
),
TP_fast_assign(
WIPHY_ASSIGN;
WDEV_ASSIGN;
__entry->cookie = cookie;
),
TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", cookie=%llu",
WIPHY_PR_ARG, WDEV_PR_ARG, __entry->cookie)
);
TRACE_EVENT(rdev_set_mac_acl, TRACE_EVENT(rdev_set_mac_acl,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_acl_data *params), struct cfg80211_acl_data *params),
......
...@@ -912,7 +912,7 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev) ...@@ -912,7 +912,7 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)
if (!wdev->connect_keys) if (!wdev->connect_keys)
return; return;
for (i = 0; i < 4; i++) { for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++) {
if (!wdev->connect_keys->params[i].cipher) if (!wdev->connect_keys->params[i].cipher)
continue; continue;
if (rdev_add_key(rdev, dev, i, false, NULL, if (rdev_add_key(rdev, dev, i, false, NULL,
...@@ -1008,8 +1008,9 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, ...@@ -1008,8 +1008,9 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
if (otype == NL80211_IFTYPE_AP_VLAN) if (otype == NL80211_IFTYPE_AP_VLAN)
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* cannot change into P2P device type */ /* cannot change into P2P device or NAN */
if (ntype == NL80211_IFTYPE_P2P_DEVICE) if (ntype == NL80211_IFTYPE_P2P_DEVICE ||
ntype == NL80211_IFTYPE_NAN)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!rdev->ops->change_virtual_intf || if (!rdev->ops->change_virtual_intf ||
...@@ -1088,6 +1089,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, ...@@ -1088,6 +1089,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
/* not happening */ /* not happening */
break; break;
case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_P2P_DEVICE:
case NL80211_IFTYPE_NAN:
WARN_ON(1); WARN_ON(1);
break; break;
} }
...@@ -1760,6 +1762,28 @@ int cfg80211_get_station(struct net_device *dev, const u8 *mac_addr, ...@@ -1760,6 +1762,28 @@ int cfg80211_get_station(struct net_device *dev, const u8 *mac_addr,
} }
EXPORT_SYMBOL(cfg80211_get_station); EXPORT_SYMBOL(cfg80211_get_station);
void cfg80211_free_nan_func(struct cfg80211_nan_func *f)
{
int i;
if (!f)
return;
kfree(f->serv_spec_info);
kfree(f->srf_bf);
kfree(f->srf_macs);
for (i = 0; i < f->num_rx_filters; i++)
kfree(f->rx_filters[i].filter);
for (i = 0; i < f->num_tx_filters; i++)
kfree(f->tx_filters[i].filter);
kfree(f->rx_filters);
kfree(f->tx_filters);
kfree(f);
}
EXPORT_SYMBOL(cfg80211_free_nan_func);
/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */ /* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
/* Ethernet-II snap header (RFC1042 for most EtherTypes) */ /* Ethernet-II snap header (RFC1042 for most EtherTypes) */
const unsigned char rfc1042_header[] __aligned(2) = const unsigned char rfc1042_header[] __aligned(2) =
......
...@@ -406,12 +406,16 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev, ...@@ -406,12 +406,16 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
if (pairwise && !addr) if (pairwise && !addr)
return -EINVAL; return -EINVAL;
/*
* In many cases we won't actually need this, but it's better
* to do it first in case the allocation fails. Don't use wext.
*/
if (!wdev->wext.keys) { if (!wdev->wext.keys) {
wdev->wext.keys = kzalloc(sizeof(*wdev->wext.keys), wdev->wext.keys = kzalloc(sizeof(*wdev->wext.keys),
GFP_KERNEL); GFP_KERNEL);
if (!wdev->wext.keys) if (!wdev->wext.keys)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < 4; i++) for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
wdev->wext.keys->params[i].key = wdev->wext.keys->params[i].key =
wdev->wext.keys->data[i]; wdev->wext.keys->data[i];
} }
...@@ -493,7 +497,13 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev, ...@@ -493,7 +497,13 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
if (err) if (err)
return err; return err;
if (!addr) { /*
* We only need to store WEP keys, since they're the only keys that
* can be be set before a connection is established and persist after
* disconnecting.
*/
if (!addr && (params->cipher == WLAN_CIPHER_SUITE_WEP40 ||
params->cipher == WLAN_CIPHER_SUITE_WEP104)) {
wdev->wext.keys->params[idx] = *params; wdev->wext.keys->params[idx] = *params;
memcpy(wdev->wext.keys->data[idx], memcpy(wdev->wext.keys->data[idx],
params->key, params->key_len); params->key, params->key_len);
......
...@@ -46,7 +46,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev, ...@@ -46,7 +46,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL); ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
if (!ck) if (!ck)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < 4; i++) for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
ck->params[i].key = ck->data[i]; ck->params[i].key = ck->data[i];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment