diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-09 20:52:36 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-09 20:52:36 +0200 |
| commit | a736e074680745faa5dc6be8dd3c58ad4850aab9 (patch) | |
| tree | 620e6d20cfce3806399fbefa8d911cc848463f9b /net/llc | |
| parent | Merge branch 'Add-support-for-XGMAC2-in-stmmac' (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
| download | linux-a736e074680745faa5dc6be8dd3c58ad4850aab9.tar.xz linux-a736e074680745faa5dc6be8dd3c58ad4850aab9.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Overlapping changes in RXRPC, changing to ktime_get_seconds() whilst
adding some tracepoints.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/llc_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c index 89041260784c..260b3dc1b4a2 100644 --- a/net/llc/llc_core.c +++ b/net/llc/llc_core.c @@ -73,8 +73,8 @@ struct llc_sap *llc_sap_find(unsigned char sap_value) rcu_read_lock_bh(); sap = __llc_sap_find(sap_value); - if (sap) - llc_sap_hold(sap); + if (!sap || !llc_sap_hold_safe(sap)) + sap = NULL; rcu_read_unlock_bh(); return sap; } |