Message ID | 56391F0B.2060102@users.sourceforge.net |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
On Tuesday, November 03, 2015 21:54:35 SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Tue, 3 Nov 2015 20:41:02 +0100 > > Let us split a check for a condition at the beginning of the > batadv_is_ap_isolated() function so that a direct return can be performed > in this function if the variable "vlan" contained a null pointer. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > net/batman-adv/translation-table.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Applied in revision b1199c6. Thanks, Marek
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 48315de..965a004 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -3319,7 +3319,10 @@ bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, u8 *src, u8 *dst, bool ret = false; vlan = batadv_softif_vlan_get(bat_priv, vid); - if (!vlan || !atomic_read(&vlan->ap_isolation)) + if (!vlan) + return false; + + if (!atomic_read(&vlan->ap_isolation)) goto out; tt_local_entry = batadv_tt_local_hash_find(bat_priv, dst, vid);