Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / drivers / net / wireless / iwlwifi / iwl-core.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index e22563ad352d861a27bf97e49b5e3050f676731a..7193d97630dce3b3ad068667181e34c71bc48975 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -120,7 +120,7 @@ struct iwl_ops {
 
 struct iwl_mod_params {
        int disable;            /* def: 0 = enable radio */
-       int hw_crypto;          /* def: 0 = using software encryption */
+       int sw_crypto;          /* def: 0 = using hardware encryption */
        int debug;              /* def: 0 = minimal debug log messages */
        int disable_hw_scan;    /* def: 0 = use h/w scan */
        int num_of_queues;      /* def: HW dependent */