staging: vt6656: main_usb.c Replace DEVICE_PARAM RxDescriptors0
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 16 Jul 2014 21:22:06 +0000 (22:22 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jul 2014 01:01:53 +0000 (18:01 -0700)
Replace with vnt_rx_buffers using module_param_named and
MODULE_PARM_DESC

Check user doe not set rx_buffer beyond the define limits of driver

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/main_usb.c

index ed56b603bb39acd8670d797475f79e7633f5ba49..6e79c4c012fc408844b7e65c9918f2bcbb2e1cf4 100644 (file)
@@ -78,7 +78,9 @@ MODULE_DESCRIPTION(DEVICE_FULL_DRV_NAM);
        MODULE_PARM_DESC(N, D)
 
 #define RX_DESC_DEF0 64
-DEVICE_PARAM(RxDescriptors0, "Number of receive usb desc buffer");
+static int vnt_rx_buffers = RX_DESC_DEF0;
+module_param_named(rx_buffers, vnt_rx_buffers, int, 0644);
+MODULE_PARM_DESC(rx_buffers, "Number of receive usb rx buffers");
 
 #define TX_DESC_DEF0 64
 DEVICE_PARAM(TxDescriptors0, "Number of transmit usb desc buffer");
@@ -203,7 +205,13 @@ static void usb_device_reset(struct vnt_private *pDevice);
 static void device_set_options(struct vnt_private *priv)
 {
        priv->cbTD = TX_DESC_DEF0;
-       priv->cbRD = RX_DESC_DEF0;
+
+       /* Set number of RX buffers */
+       if (vnt_rx_buffers < CB_MIN_RX_DESC || vnt_rx_buffers > CB_MAX_RX_DESC)
+               priv->cbRD = RX_DESC_DEF0;
+       else
+               priv->cbRD = vnt_rx_buffers;
+
        priv->byShortRetryLimit = SHORT_RETRY_DEF;
        priv->byLongRetryLimit = LONG_RETRY_DEF;
        priv->op_mode = NL80211_IFTYPE_UNSPECIFIED;