Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48a84770 authored by Henrik Brix Andersen's avatar Henrik Brix Andersen Committed by John W. Linville
Browse files

[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: default avatarHenrik Brix Andersen <brix@gentoo.org>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 53d0bcf8

Documentation/networking/README.ipw2200

+30 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Index 
1.2. Module parameters

1.3. Wireless Extension Private Methods

1.4. Sysfs Helper Files

1.5. Supported channels

2.   Ad-Hoc Networking

3.   Interacting with Wireless Tools

3.1. iwconfig mode
@@ -314,6 +315,35 @@ For the device level files, see /sys/bus/pci/drivers/ipw2200: 
	running ifconfig and is therefore disabled by default.





1.5. Supported channels

-----------------------------------------------



Upon loading the Intel(R) PRO/Wireless 2915ABG Driver for Linux, a

message stating the detected geography code and the number of 802.11

channels supported by the card will be displayed in the log.



The geography code corresponds to a regulatory domain as shown in the

table below.



					  Supported channels

Code	Geography			802.11bg	802.11a



---	Restricted			11 	 	 0

ZZF	Custom US/Canada		11	 	 8

ZZD	Rest of World			13	 	 0

ZZA	Custom USA & Europe & High	11		13

ZZB	Custom NA & Europe    		11		13

ZZC	Custom Japan			11	 	 4

ZZM	Custom 				11	 	 0

ZZE	Europe				13		19

ZZJ	Custom Japan			14	 	 4

ZZR	Rest of World			14	 	 0

ZZH	High Band			13	 	 4

ZZG	Custom Europe			13	 	 4

ZZK	Europe 				13		24

ZZL	Europe				11		13





2.   Ad-Hoc Networking

-----------------------------------------------

drivers/net/wireless/ipw2200.c

+9 −3
Original line number Diff line number Diff line
@@ -10364,6 +10364,9 @@ static int ipw_config(struct ipw_priv *priv) 
 * not intended for resale of the above mentioned Intel adapters has

 * not been tested.

 *

 * Remember to update the table in README.ipw2200 when changing this

 * table.

 *

 */

static const struct ieee80211_geo ipw_geos[] = {

	{			/* Restricted */
@@ -10662,9 +10665,6 @@ static int ipw_up(struct ipw_priv *priv) 
			return 0;

		}



		IPW_DEBUG_INFO("Geography %03d [%s] detected.\n",

			       j, priv->ieee->geo.name);



		if (priv->status & STATUS_RF_KILL_SW) {

			IPW_WARNING("Radio disabled by module parameter.\n");

			return 0;
@@ -10985,6 +10985,12 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		IPW_ERROR("failed to register network device\n");

		goto out_remove_sysfs;

	}



	printk(KERN_INFO DRV_NAME ": Detected geography %s (%d 802.11bg "

	       "channels, %d 802.11a channels)\n",

	       priv->ieee->geo.name, priv->ieee->geo.bg_channels,

	       priv->ieee->geo.a_channels);



	return 0;



      out_remove_sysfs: