mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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 <[email protected]>
This commit is contained in:
commit
a736e07468
40 changed files with 374 additions and 355 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue