Skip to content

Commit

Permalink
netvsc: simplify rndis_filter_remove
Browse files Browse the repository at this point in the history 
All caller's already have pointer to netvsc_device so pass it.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
stephen hemminger authored and David S. Miller committed Jan 24, 2017
1 parent 2c7f83c commit 2289f0a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
3 changes: 2 additions & 1 deletion drivers/net/hyperv/hyperv_net.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ int rndis_filter_open(struct netvsc_device *nvdev);
int rndis_filter_close(struct netvsc_device *nvdev);
int rndis_filter_device_add(struct hv_device *dev,
struct netvsc_device_info *info);
void rndis_filter_device_remove(struct hv_device *dev);
void rndis_filter_device_remove(struct hv_device *dev,
struct netvsc_device *nvdev);
int rndis_filter_set_rss_param(struct rndis_device *rdev,
const u8 *key, int num_queue);
int rndis_filter_receive(struct net_device *ndev,
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/hyperv/netvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ static int netvsc_set_channels(struct net_device *net,
return ret;

net_device_ctx->start_remove = true;
rndis_filter_device_remove(dev);
rndis_filter_device_remove(dev, nvdev);

ret = netvsc_set_queues(net, dev, count);
if (ret == 0)
Expand Down Expand Up @@ -865,7 +865,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
goto out;

ndevctx->start_remove = true;
rndis_filter_device_remove(hdev);
rndis_filter_device_remove(hdev, nvdev);

ndev->mtu = mtu;

Expand Down Expand Up @@ -1493,7 +1493,7 @@ static int netvsc_probe(struct hv_device *dev,
ret = register_netdev(net);
if (ret != 0) {
pr_err("Unable to register netdev.\n");
rndis_filter_device_remove(dev);
rndis_filter_device_remove(dev, nvdev);
netvsc_free_netdev(net);
}

Expand Down Expand Up @@ -1533,7 +1533,7 @@ static int netvsc_remove(struct hv_device *dev)
* Call to the vsc driver to let it know that the device is being
* removed
*/
rndis_filter_device_remove(dev);
rndis_filter_device_remove(dev, ndev_ctx->nvdev);

hv_set_drvdata(dev, NULL);

Expand Down
12 changes: 6 additions & 6 deletions drivers/net/hyperv/rndis_filter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ int rndis_filter_device_add(struct hv_device *dev,
/* Send the rndis initialization message */
ret = rndis_filter_init_device(rndis_device);
if (ret != 0) {
rndis_filter_device_remove(dev);
rndis_filter_device_remove(dev, net_device);
return ret;
}

Expand All @@ -1068,7 +1068,7 @@ int rndis_filter_device_add(struct hv_device *dev,
/* Get the mac address */
ret = rndis_filter_query_device_mac(rndis_device);
if (ret != 0) {
rndis_filter_device_remove(dev);
rndis_filter_device_remove(dev, net_device);
return ret;
}

Expand All @@ -1077,7 +1077,7 @@ int rndis_filter_device_add(struct hv_device *dev,
/* Find HW offload capabilities */
ret = rndis_query_hwcaps(rndis_device, &hwcaps);
if (ret != 0) {
rndis_filter_device_remove(dev);
rndis_filter_device_remove(dev, net_device);
return ret;
}

Expand Down Expand Up @@ -1233,13 +1233,13 @@ int rndis_filter_device_add(struct hv_device *dev,
return 0; /* return 0 because primary channel can be used alone */

err_dev_remv:
rndis_filter_device_remove(dev);
rndis_filter_device_remove(dev, net_device);
return ret;
}

void rndis_filter_device_remove(struct hv_device *dev)
void rndis_filter_device_remove(struct hv_device *dev,
struct netvsc_device *net_dev)
{
struct netvsc_device *net_dev = hv_device_to_netvsc_device(dev);
struct rndis_device *rndis_dev = net_dev->extension;

/* If not all subchannel offers are complete, wait for them until
Expand Down

0 comments on commit 2289f0a

Please sign in to comment.