diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
| commit | 08fb98f5bf95cef902fc30427b39617a6f6875c7 (patch) | |
| tree | d709cdc500b447bb957fd1e7fbc9073005b8ce8e /net/tipc/bearer.c | |
| parent | 99aa22d0d8f70d9317727ab40c85b2ead740a6ca (diff) | |
| parent | a017f583ec87d40b06eee6a6beeabe879c8113dd (diff) | |
Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tipc/bearer.c')
| -rw-r--r-- | net/tipc/bearer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 6f11c62bc8f9..bf8f05c3eb82 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -405,7 +405,7 @@ int tipc_l2_send_msg(struct net *net, struct sk_buff *skb, return 0; /* Send RESET message even if bearer is detached from device */ - tipc_ptr = rtnl_dereference(dev->tipc_ptr); + tipc_ptr = rcu_dereference_rtnl(dev->tipc_ptr); if (unlikely(!tipc_ptr && !msg_is_reset(buf_msg(skb)))) goto drop; |