diff options
| author | Sven Eckelmann <sven.eckelmann@open-mesh.com> | 2016-09-30 16:21:03 +0300 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2016-11-08 21:02:37 +0300 |
| commit | 10b1bbb46c6c8e571458a9a8913514dbebbaf20c (patch) | |
| tree | d6485a43f41c5867811004a8766eaafc3a56ce3f /net/batman-adv/bat_iv_ogm.c | |
| parent | f44a3ae9a2811cfd5321e0f72c02bc270410db64 (diff) | |
| download | linux-10b1bbb46c6c8e571458a9a8913514dbebbaf20c.tar.xz | |
batman-adv: Cache the type of wifi device for each hardif
batman-adv is requiring the type of wifi device in different contexts. Some
of them can take the rtnl semaphore and some of them already have the
semaphore taken. But even others don't allow that the semaphore will be
taken.
The data has to be retrieved when the hardif is added to batman-adv because
some of the wifi information for an hardif will only be available with rtnl
lock. It can then be cached in the batadv_hard_iface and the functions
is_wifi_netdev and is_cfg80211_netdev can just compare the correct bits
without imposing extra locking requirements.
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.c')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index bd39247e2f0f..36d8818b538f 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1272,7 +1272,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, */ tq_iface_penalty = BATADV_TQ_MAX_VALUE; if (if_outgoing && (if_incoming == if_outgoing) && - batadv_is_wifi_netdev(if_outgoing->net_dev)) + batadv_is_wifi_hardif(if_outgoing)) tq_iface_penalty = batadv_hop_penalty(BATADV_TQ_MAX_VALUE, bat_priv); |