aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2006-02-13 20:09:52 -0500
committerJohn W. Linville <linville@tuxdriver.com>2006-03-17 15:08:02 -0500
commit48a847709f821b5eecd45ae7660add1869f9cd37 (patch)
treed119ae07dbaf63a77362307cbb3fbebf6218636e /drivers/net
parent53d0bcf82a5f59c96f1ffb202c02d2541200bf58 (diff)
[PATCH] ipw2200: print geography code upon module load
Given the amount of support requests for the meaning of the geography code I've written a patch for printing this information on module load no matter the debug level. I've also added a section to the README.ipw2200 file listing the geography codes and their meaning. Signed-off-by: Henrik Brix Andersen <brix@gentoo.org> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ipw2200.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index d8a2a6fa72e3..a7483809d872 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -10364,6 +10364,9 @@ static int ipw_config(struct ipw_priv *priv)
10364 * not intended for resale of the above mentioned Intel adapters has 10364 * not intended for resale of the above mentioned Intel adapters has
10365 * not been tested. 10365 * not been tested.
10366 * 10366 *
10367 * Remember to update the table in README.ipw2200 when changing this
10368 * table.
10369 *
10367 */ 10370 */
10368static const struct ieee80211_geo ipw_geos[] = { 10371static const struct ieee80211_geo ipw_geos[] = {
10369 { /* Restricted */ 10372 { /* Restricted */
@@ -10662,9 +10665,6 @@ static int ipw_up(struct ipw_priv *priv)
10662 return 0; 10665 return 0;
10663 } 10666 }
10664 10667
10665 IPW_DEBUG_INFO("Geography %03d [%s] detected.\n",
10666 j, priv->ieee->geo.name);
10667
10668 if (priv->status & STATUS_RF_KILL_SW) { 10668 if (priv->status & STATUS_RF_KILL_SW) {
10669 IPW_WARNING("Radio disabled by module parameter.\n"); 10669 IPW_WARNING("Radio disabled by module parameter.\n");
10670 return 0; 10670 return 0;
@@ -10985,6 +10985,12 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
10985 IPW_ERROR("failed to register network device\n"); 10985 IPW_ERROR("failed to register network device\n");
10986 goto out_remove_sysfs; 10986 goto out_remove_sysfs;
10987 } 10987 }
10988
10989 printk(KERN_INFO DRV_NAME ": Detected geography %s (%d 802.11bg "
10990 "channels, %d 802.11a channels)\n",
10991 priv->ieee->geo.name, priv->ieee->geo.bg_channels,
10992 priv->ieee->geo.a_channels);
10993
10988 return 0; 10994 return 0;
10989 10995
10990 out_remove_sysfs: 10996 out_remove_sysfs: