Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -51,10 +51,7 @@ struct rmnet_walk_data {
|
||||
|
||||
static int rmnet_is_real_dev_registered(const struct net_device *real_dev)
|
||||
{
|
||||
rx_handler_func_t *rx_handler;
|
||||
|
||||
rx_handler = rcu_dereference(real_dev->rx_handler);
|
||||
return (rx_handler == rmnet_rx_handler);
|
||||
return rcu_access_pointer(real_dev->rx_handler) == rmnet_rx_handler;
|
||||
}
|
||||
|
||||
/* Needs rtnl lock */
|
||||
|
Reference in New Issue
Block a user