Changeset 1362

Timestamp:

12/19/05 09:58:47 (3 years ago)

Author:

svens

Message:

Added support for enabling/disabling rfkill capability,
can be switched on/off with rfkill=x module option.

Files:

• trunk/ath/if_ath.c (modified) (4 diffs)
• trunk/ath/if_athvar.h (modified) (1 diff)

trunk/ath/if_ath.c

@@ -258 +258 @@
-static  int ath_xchanmode = AH_TRUE;            /* enable extended channels */
-
+static  int rfkill = -1;
-static  int countrycode = -1;
-static  int outdoor = -1;
@@ -285 +286 @@
-MODULE_PARM(outdoor, "i");
-MODULE_PARM(xchanmode, "i");
+MODULE_PARM(rfkill, "i");
-#else
-#include <linux/moduleparam.h>
@@ -290 +292 @@
-module_param(outdoor, int, 0);
-module_param(xchanmode, int, 0);
+module_param(rfkill, int, 0);
-#endif
-MODULE_PARM_DESC(countrycode, "Override default country code");
-MODULE_PARM_DESC(outdoor, "Enable/disable outdoor use");
-MODULE_PARM_DESC(xchanmode, "Enable/disable extended channel mode");
+MODULE_PARM_DESC(rfkill, "Enable/disable RFKILL capability");
-
-#ifdef AR_DEBUG
@@ -498 +502 @@
-        ic->ic_country_code = ath_countrycode;
-        ic->ic_country_outdoor = ath_outdoor;
+
+        if(rfkill != -1) {
+           printk(KERN_INFO "ath_pci: switching rfkill capability %s\n", rfkill ? "on" : "off");        
+           ath_hal_setrfsilent(ah, rfkill);
+        }
-
-        /*

trunk/ath/if_athvar.h

@@ -879 +879 @@
-#define ath_hal_settsfadjust(_ah, _v) \
-        ath_hal_setcapability(_ah, HAL_CAP_TSF_ADJUST, 1, _v, NULL)
+#define ath_hal_setrfsilent(_ah, _v) \
+        ath_hal_setcapability(_ah, HAL_CAP_RFSILENT, 1, _v, NULL)
+#define ath_hal_hasrfsilent(_ah) \
+        (ath_hal_getcapability(_ah, HAL_CAP_RFSILENT, 0, NULL) == HAL_OK)
-
-#define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \