[PATCH] Remove module parameters for the settings controlled by iwpriv

Module parameters are not well suited for device-specific settings.

Signed-off-by: Pavel Roskin <proski@gnu.org>

1 files changed, 5 insertions, 24 deletions

diff --git a/at76_usb.c b/at76_usb.c
index b8709ad..d6a1e68 100644
--- a/at76_usb.c
+++ b/at76_usb.c
@@ -174,11 +174,6 @@ MODULE_DEVICE_TABLE(usb, dev_table);
 static int rx_copybreak = 200;
 static int scan_min_time = 10;
 static int scan_max_time = 120;
-static int scan_mode = SCAN_TYPE_ACTIVE;
-static int preamble_type = PREAMBLE_TYPE_LONG;
-static int auth_mode;
-static int international_roaming; /* = IR_OFF */
-static int default_iw_mode = IW_MODE_INFRA;
 
 /* the supported rates of this hardware, bit7 marks a basic rate */
 static const u8 hw_rates[] = { 0x82, 0x84, 0x0b, 0x16 };
@@ -4136,21 +4131,21 @@ static int at76_init_new_device(struct at76_priv *priv,
 	     mac2str(priv->mac_addr), priv->domain->name, priv->regulatory_domain);
 
 	/* initializing */
-	priv->international_roaming = international_roaming;
+	priv->international_roaming = IR_OFF;
 	priv->channel = DEF_CHANNEL;
-	priv->iw_mode = default_iw_mode;
+	priv->iw_mode = IW_MODE_INFRA;
 	memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
 	priv->rts_threshold = DEF_RTS_THRESHOLD;
 	priv->frag_threshold = DEF_FRAG_THRESHOLD;
 	priv->short_retry_limit = DEF_SHORT_RETRY_LIMIT;
 	priv->txrate = TX_RATE_AUTO;
-	priv->preamble_type = preamble_type;
+	priv->preamble_type = PREAMBLE_TYPE_LONG;
 	priv->beacon_period = 100;
 	priv->beacons_last_qual = jiffies_to_msecs(jiffies);
-	priv->auth_mode = auth_mode ? WLAN_AUTH_SHARED_KEY : WLAN_AUTH_OPEN;
+	priv->auth_mode = WLAN_AUTH_OPEN;
 	priv->scan_min_time = scan_min_time;
 	priv->scan_max_time = scan_max_time;
-	priv->scan_mode = scan_mode;
+	priv->scan_mode = SCAN_TYPE_ACTIVE;
 
 	netdev->flags &= ~IFF_MULTICAST; /* not yet or never */
 	netdev->open = at76_open;
@@ -6257,20 +6252,6 @@ module_param_named(debug, at76_debug, int, 0600);
 MODULE_PARM_DESC(debug, "Debugging level");
 module_param(rx_copybreak, int, 0400);
 MODULE_PARM_DESC(rx_copybreak, "rx packet copy threshold");
-module_param(scan_min_time, int, 0400);
-MODULE_PARM_DESC(scan_min_time, "scan min channel time (default: 10)");
-module_param(scan_max_time, int, 0400);
-MODULE_PARM_DESC(scan_max_time, "scan max channel time (default: 120)");
-module_param(scan_mode, int, 0400);
-MODULE_PARM_DESC(scan_mode, "scan mode: 0 active (with ProbeReq, default), 1 passive");
-module_param(preamble_type, int, 0400);
-MODULE_PARM_DESC(preamble_type, "preamble type: 0 long (default), 1 short");
-module_param(auth_mode, int, 0400);
-MODULE_PARM_DESC(auth_mode, "authentication mode: 0 open system (default), 1 shared secret");
-module_param(international_roaming, int, 0400);
-MODULE_PARM_DESC(international_roaming, "enable international roaming: 0 (no, default), 1 (yes)");
-module_param(default_iw_mode, int, 0400);
-MODULE_PARM_DESC(default_iw_mode, "default IW mode for a new device: 1 (ad-hoc), 2 (infrastructure, def.), 6 (monitor mode)");
 
 module_init(at76_mod_init);
 module_exit(at76_mod_exit);