diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-06 03:57:03 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-06 04:19:22 +0300 |
| commit | 53954cf8c5d205624167a2bfd117cc0c1a5f3c6d (patch) | |
| tree | a287f0c80eb616758bb5212523c8fb3d8fc350a4 /drivers/net/ethernet/qualcomm/rmnet | |
| parent | 4b54db1375757aa3e870c075065a8ab9350d26c4 (diff) | |
| parent | 7a92616c0bac849e790283723b36c399668a1d9f (diff) | |
| download | linux-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.tar.xz | |
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>
Diffstat (limited to 'drivers/net/ethernet/qualcomm/rmnet')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c index 1af326a60cbb..8403eea08d0e 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c @@ -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 */ |