Make module loading and unloading much less noisy. I don't believe any of this ifnrom...

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3742 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/ath/if_ath.c b/ath/if_ath.c
index 1c5aad1810ec6de57cd961564d32f848432f8d1b..594a158ffe0e31df246c47f4af3f16f3d8713462 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -595,8 +595,8 @@ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
                                "supported by the HAL.\n");
                hal_tpc = 0;
        }
-       IPRINTF(sc, "HAL managed transmit power control (TPC) %s.\n",
-               hal_tpc ? "enabled" : "disabled");
+       DPRINTF(sc, ATH_DEBUG_ANY, "HAL managed transmit power control (TPC) "
+               "%s.\n", hal_tpc ? "enabled" : "disabled");
        ath_hal_settpc(ah, hal_tpc);
 #else
        sc->sc_hastpc = 0;
@@ -623,7 +623,8 @@ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
        }
        else {
                ath_hal_setintmit(ah, sc->sc_useintmit);
-               IPRINTF(sc, "Interference mitigation is supported.  Currently %s.\n",
+               DPRINTF(sc, ATH_DEBUG_ANY, "Interference mitigation is "
+                       "supported.  Currently %s.\n",
                        (sc->sc_useintmit ? "enabled" : "disabled"));
        }
 
@@ -11193,7 +11194,9 @@ ath_announce(struct net_device *dev)
        struct ath_softc *sc = dev->priv;
        struct ath_hal *ah = sc->sc_ah;
        u_int modes, cc;
+#if 0
        unsigned int i;
+#endif
 
        printk(KERN_INFO "%s: Atheros AR%s chip found (MAC %d.%d, ",
                DEV_NAME(dev),
@@ -11226,6 +11229,8 @@ ath_announce(struct net_device *dev)
                        ah->ah_analog5GhzRev & 0xf);
        }
 
+/* Disabled - this information is not operationally useful. */
+#if 0
        for (i = 0; i <= WME_AC_VO; i++) {
                struct ath_txq *txq = sc->sc_ac2q[i];
                printk(KERN_INFO "%s: Use H/W queue %u for %s traffic\n",
@@ -11247,6 +11252,7 @@ ath_announce(struct net_device *dev)
                DEV_NAME(dev), sc->sc_cabq->axq_qnum);
        printk(KERN_INFO "%s: Use hw queue %u for beacons\n",
                DEV_NAME(dev), sc->sc_bhalq);
+#endif
 }
  
 /*

diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c
index 6c7d4b5e8d31a7e80314f2011ab25ae6442dbe17..7132607ff3408c16eefc2d5b30117a4acb5ff54e 100644 (file)
--- a/ath/if_ath_pci.c
+++ b/ath/if_ath_pci.c
@@ -380,10 +380,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 static int __init
 init_ath_pci(void)
 {
-       int status;
-       printk(KERN_INFO "%s: %s\n", dev_info, version);
-
-       status = pci_register_driver(&ath_pci_driver);
+       int status = pci_register_driver(&ath_pci_driver);
        if (status)
                return (status);
        ath_sysctl_register();
@@ -396,8 +393,6 @@ exit_ath_pci(void)
 {
        ath_sysctl_unregister();
        pci_unregister_driver(&ath_pci_driver);
-
-       printk(KERN_INFO "%s: driver unloaded\n", dev_info);
 }
 module_exit(exit_ath_pci);
 

diff --git a/ath_hal/ah_os.c b/ath_hal/ah_os.c
index 8228afc4df3502ddcd93b4503628ae7ce955bdf2..09ff9cdfac6c0af306d81574c0922afc6a765093 100644 (file)
--- a/ath_hal/ah_os.c
+++ b/ath_hal/ah_os.c
@@ -1082,7 +1082,9 @@ ath_hal_sysctl_unregister(void)
  * Module glue.
  */
 #include "version.h"
+#if 0
 static char *dev_info = "ath_hal";
+#endif
 
 MODULE_AUTHOR("Errno Consulting, Sam Leffler");
 MODULE_DESCRIPTION("Atheros Hardware Access Layer (HAL)");
@@ -1122,7 +1124,6 @@ init_ath_hal(void)
        kmmio_logmsg = _kmmio_logmsg;
 #endif
 
-       printk("%s: %s (", dev_info, ath_hal_version);
        sep = "";
        for (i = 0; ath_hal_buildopts[i] != NULL; i++) {
                printk("%s%s", sep, ath_hal_buildopts[i]);
@@ -1141,6 +1142,5 @@ exit_ath_hal(void)
        kmmio_logmsg = NULL;
 #endif
        ath_hal_sysctl_unregister();
-       printk("%s: driver unloaded\n", dev_info);
 }
 module_exit(exit_ath_hal);

diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c
index 725291d53ccfa4c30b5119094d964d134b20b397..f8dae53222fba94d208e1f0a9e5760a2215c5b80 100644 (file)
--- a/ath_rate/amrr/amrr.c
+++ b/ath_rate/amrr/amrr.c
@@ -555,8 +555,10 @@ static struct ieee80211_rate_ops ath_rate_ops = {
 };
 
 #include "release.h"
+#if 0
 static char *version = "0.1 (" RELEASE_VERSION ")";
 static char *dev_info = "ath_rate_amrr";
+#endif
 
 MODULE_AUTHOR("INRIA, Mathieu Lacage");
 MODULE_DESCRIPTION("AMRR Rate control algorithm");
@@ -570,10 +572,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 static int __init
 init_ath_rate_amrr(void)
 {
-       int ret;
-       printk(KERN_INFO "%s: %s\n", dev_info, version);
-
-       ret = ieee80211_rate_register(&ath_rate_ops);
+       int ret = ieee80211_rate_register(&ath_rate_ops);
        if (ret)
                return ret;
 
@@ -588,7 +587,5 @@ exit_ath_rate_amrr(void)
        if (ath_sysctl_header != NULL)
                unregister_sysctl_table(ath_sysctl_header);
        ieee80211_rate_unregister(&ath_rate_ops);
-
-       printk(KERN_INFO "%s: unloaded\n", dev_info);
 }
 module_exit(exit_ath_rate_amrr);

diff --git a/ath_rate/minstrel/minstrel.c b/ath_rate/minstrel/minstrel.c
index 24f251e1fa2327ec3e49e2541495d9594e21c710..c63f0d037139282e98beb9dd1afe8e377371cd45 100644 (file)
--- a/ath_rate/minstrel/minstrel.c
+++ b/ath_rate/minstrel/minstrel.c
@@ -133,8 +133,9 @@ enum {
 #define ONE_SECOND (1000 * 1000)  /* 1 second, or 1000 milliseconds; eternity, in other words */
 
 #include "release.h"
-
+#if 0
 static char *version = "1.2 (" RELEASE_VERSION ")";
+#endif
 static char *dev_info = "ath_rate_minstrel";
 
 #define STALE_FAILURE_TIMEOUT_MS 10000
@@ -1091,14 +1092,15 @@ MODULE_LICENSE("Dual BSD/GPL");
 
 static int __init ath_rate_minstrel_init(void)
 {
-       printk(KERN_INFO "%s: Minstrel automatic rate control "
-              "algorithm %s\n", dev_info, version);
+/* Debugging output - disabled as noisy. */
+#if 0
        printk(KERN_INFO "%s: look around rate set to %d%%\n",
               dev_info, ath_lookaround_rate);
        printk(KERN_INFO "%s: EWMA rolloff level set to %d%%\n",
               dev_info, ath_ewma_level);
-       printk(KERN_INFO "%s: max segment size in the mrr set "
+       printk(KERN_INFO "%s: max segment size in the MRR set "
               "to %d us\n", dev_info, ath_segment_size);
+#endif
        return ieee80211_rate_register(&ath_rate_ops);
 }
 module_init(ath_rate_minstrel_init);
@@ -1106,7 +1108,6 @@ module_init(ath_rate_minstrel_init);
 static void __exit ath_rate_minstrel_exit(void)
 {
        ieee80211_rate_unregister(&ath_rate_ops);
-       printk(KERN_INFO "%s: unloaded\n", dev_info);
 }
 module_exit(ath_rate_minstrel_exit);
 

diff --git a/ath_rate/onoe/onoe.c b/ath_rate/onoe/onoe.c
index a4efabc926b0ae34d6beb2dbd7ff9257662a6258..3032c74abb6fb316ba4de91780ea2a444b559a47 100644 (file)
--- a/ath_rate/onoe/onoe.c
+++ b/ath_rate/onoe/onoe.c
@@ -502,8 +502,10 @@ static struct ieee80211_rate_ops ath_rate_ops = {
 };
 
 #include "release.h"
+#if 0
 static char *version = "1.0 (" RELEASE_VERSION ")";
 static char *dev_info = "ath_rate_onoe";
+#endif
 
 MODULE_AUTHOR("Errno Consulting, Sam Leffler");
 MODULE_DESCRIPTION("Atsushi Onoe's rate control algorithm for Atheros devices");
@@ -517,10 +519,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 static int __init
 init_ath_rate_onoe(void)
 {
-       int ret;
-       printk(KERN_INFO "%s: %s\n", dev_info, version);
-
-       ret = ieee80211_rate_register(&ath_rate_ops);
+       int ret = ieee80211_rate_register(&ath_rate_ops);
        if (ret)
                return ret;
 
@@ -535,7 +534,5 @@ exit_ath_rate_onoe(void)
        if (ath_sysctl_header != NULL)
                unregister_sysctl_table(ath_sysctl_header);
        ieee80211_rate_unregister(&ath_rate_ops);
-
-       printk(KERN_INFO "%s: unloaded\n", dev_info);
 }
 module_exit(exit_ath_rate_onoe);

diff --git a/ath_rate/sample/sample.c b/ath_rate/sample/sample.c
index 8ff8958c58034c954455674065d282826fefde6d..81bb2ffc2886f055c8c8f7df067deca18ca94fdc 100644 (file)
--- a/ath_rate/sample/sample.c
+++ b/ath_rate/sample/sample.c
@@ -110,7 +110,9 @@ enum {
  */
 
 #include "release.h"
+#if 0
 static char *version = "1.2 (" RELEASE_VERSION ")";
+#endif
 static char *dev_info = "ath_rate_sample";
 
 
@@ -1136,7 +1138,6 @@ MODULE_LICENSE("Dual BSD/GPL");
 static int __init
 init_ath_rate_sample(void)
 {
-       printk(KERN_INFO "%s: %s\n", dev_info, version);
        return ieee80211_rate_register(&ath_rate_ops);
 }
 module_init(init_ath_rate_sample);
@@ -1145,6 +1146,5 @@ static void __exit
 exit_ath_rate_sample(void)
 {
        ieee80211_rate_unregister(&ath_rate_ops);
-       printk(KERN_INFO "%s: unloaded\n", dev_info);
 }
 module_exit(exit_ath_rate_sample);

diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c
index fcb7a44ae0366d6351155f4c5644035115a73a11..d2c0f5895ab9547f7de543cd8c8619752b629169 100644 (file)
--- a/net80211/ieee80211.c
+++ b/net80211/ieee80211.c
@@ -1152,6 +1152,8 @@ EXPORT_SYMBOL(ieee80211_dfs_test_return);
 void
 ieee80211_announce(struct ieee80211com *ic)
 {
+/* Disabled - creates noise but no useful information. */
+#if 0
        struct net_device *dev = ic->ic_dev;
        int i, mode, rate, mword;
        struct ieee80211_rateset *rs;
@@ -1184,6 +1186,7 @@ ieee80211_announce(struct ieee80211com *ic)
        if (ic->ic_caps & IEEE80211_C_TKIP)
                printk(" TKIP");
        printk("\n");
+#endif
 }
 EXPORT_SYMBOL(ieee80211_announce);
 

diff --git a/net80211/ieee80211_linux.c b/net80211/ieee80211_linux.c
index b36946613d983344707163f2b8927f25394491be..80887f93d97e44e75e49afd42e2c3c365eed8348 100644 (file)
--- a/net80211/ieee80211_linux.c
+++ b/net80211/ieee80211_linux.c
@@ -982,8 +982,10 @@ static struct notifier_block ieee80211_event_block = {
  * Module glue.
  */
 #include "release.h"
+#if 0
 static char *version = RELEASE_VERSION;
 static char *dev_info = "wlan";
+#endif
 
 MODULE_AUTHOR("Errno Consulting, Sam Leffler");
 MODULE_DESCRIPTION("802.11 wireless LAN protocol support");
@@ -1000,7 +1002,6 @@ static int __init
 init_wlan(void)
 {
        register_netdevice_notifier(&ieee80211_event_block);
-       printk(KERN_INFO "%s: %s\n", dev_info, version);
        return 0;
 }
 module_init(init_wlan);
@@ -1009,6 +1010,5 @@ static void __exit
 exit_wlan(void)
 {
        unregister_netdevice_notifier(&ieee80211_event_block);
-       printk(KERN_INFO "%s: driver unloaded\n", dev_info);
 }
 module_exit(exit_wlan);