summaryrefslogtreecommitdiffstats
path: root/drivers/net/hyperv/rndis_filter.c
diff options
context:
space:
mode:
authorstephen hemminger2017-07-19 20:53:19 +0200
committerDavid S. Miller2017-07-20 07:20:05 +0200
commit3962981f4822aaf284234efd0500041417faea86 (patch)
tree6a381394e3fc59e48bd531f3afd1ebb8f34d47a5 /drivers/net/hyperv/rndis_filter.c
parentnetvsc: save pointer to parent netvsc_device in channel table (diff)
downloadkernel-qcow2-linux-3962981f4822aaf284234efd0500041417faea86.tar.gz
kernel-qcow2-linux-3962981f4822aaf284234efd0500041417faea86.tar.xz
kernel-qcow2-linux-3962981f4822aaf284234efd0500041417faea86.zip
netvsc: add rtnl annotations in rndis
The rndis functions are used when changing device state. Therefore the references from network device to internal state are protected by RTNL mutex. Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/rndis_filter.c')
-rw-r--r--drivers/net/hyperv/rndis_filter.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 9ab67c8309ff..e439886f72c1 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -84,6 +84,14 @@ static struct rndis_device *get_rndis_device(void)
return device;
}
+static struct netvsc_device *
+net_device_to_netvsc_device(struct net_device *ndev)
+{
+ struct net_device_context *net_device_ctx = netdev_priv(ndev);
+
+ return rtnl_dereference(net_device_ctx->nvdev);
+}
+
static struct rndis_request *get_rndis_request(struct rndis_device *dev,
u32 msg_type,
u32 msg_len)
@@ -472,7 +480,7 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
if (oid == OID_TCP_OFFLOAD_HARDWARE_CAPABILITIES) {
struct net_device_context *ndevctx = netdev_priv(dev->ndev);
- struct netvsc_device *nvdev = ndevctx->nvdev;
+ struct netvsc_device *nvdev = rtnl_dereference(ndevctx->nvdev);
struct ndis_offload *hwcaps;
u32 nvsp_version = nvdev->nvsp_version;
u8 ndis_rev;
@@ -944,7 +952,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
struct rndis_request *request;
struct rndis_halt_request *halt;
struct net_device_context *net_device_ctx = netdev_priv(dev->ndev);
- struct netvsc_device *nvdev = net_device_ctx->nvdev;
+ struct netvsc_device *nvdev = rtnl_dereference(net_device_ctx->nvdev);
/* Attempt to do a rndis device halt */
request = get_rndis_request(dev, RNDIS_MSG_HALT,