staging: hv: Convert camel cased functions in rndis_filter.c to lower cases

[firefly-linux-kernel-4.4.55.git] / drivers / staging / hv / netvsc_drv.c

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 64a01147ecaeffc17863bd0002df415da56da8f2..e47681e7be82d029b11fdaa9eca2ad88add9b0c6 100644 (file)
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -59,13 +59,16 @@ struct netvsc_driver_context {
 /* Need this many pages to handle worst case fragmented packet */
 #define PACKET_PAGES_HIWATER  (MAX_SKB_FRAGS + 2)
 
-static int ring_size = roundup_pow_of_two(2*MAX_SKB_FRAGS+1);
+static int ring_size = 128;
 module_param(ring_size, int, S_IRUGO);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
 
 /* The one and only one */
 static struct netvsc_driver_context g_netvsc_drv;
 
+/* no-op so the netdev core doesn't return -EINVAL when modifying the the
+ * multicast address list in SIOCADDMULTI. hv is setup to get all multicast
+ * when it calls RndisFilterOnOpen() */
 static void netvsc_set_multicast_list(struct net_device *net)
 {
 }
@@ -78,7 +81,7 @@ static int netvsc_open(struct net_device *net)
 
        if (netif_carrier_ok(net)) {
                /* Open up the device */
-               ret = RndisFilterOnOpen(device_obj);
+               ret = rndis_filter_open(device_obj);
                if (ret != 0) {
                        DPRINT_ERR(NETVSC_DRV,
                                   "unable to open device (ret %d).", ret);
@@ -101,7 +104,7 @@ static int netvsc_close(struct net_device *net)
 
        netif_stop_queue(net);
 
-       ret = RndisFilterOnClose(device_obj);
+       ret = rndis_filter_close(device_obj);
        if (ret != 0)
                DPRINT_ERR(NETVSC_DRV, "unable to close device (ret %d).", ret);
 
@@ -495,8 +498,6 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
        struct driver_context *drv_ctx = &g_netvsc_drv.drv_ctx;
        int ret;
 
-       vmbus_get_interface(&net_drv_obj->Base.VmbusChannelInterface);
-
        net_drv_obj->RingBufferSize = ring_size * PAGE_SIZE;
        net_drv_obj->OnReceiveCallback = netvsc_recv_callback;
        net_drv_obj->OnLinkStatusChanged = netvsc_linkstatus_callback;
@@ -538,7 +539,7 @@ static int __init netvsc_init(void)
        if (!dmi_check_system(hv_netvsc_dmi_table))
                return -ENODEV;
 
-       return netvsc_drv_init(NetVscInitialize);
+       return netvsc_drv_init(netvsc_initialize);
 }
 
 static void __exit netvsc_exit(void)