Fix typos and abbreviations

8 files changed, 33 insertions, 33 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4ee44e2..60b5401 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-$Id: CHANGELOG,v 1.3 2003/07/11 20:53:32 jal2 Exp $
+$Id: CHANGELOG,v 1.4 2006/07/14 06:29:23 proski Exp $
 
 - added switch to cope with Intersil firmware 0.84.0 which does
   not send FCS in rx data
@@ -10,7 +10,7 @@ $Id: CHANGELOG,v 1.3 2003/07/11 20:53:32 jal2 Exp $
 - added test of valid channel in reg. domain
 - added big endian patch (by Kevin Cernekee), changed defines in
   ieee802_11.h
-- supress unsupported iwconfig modes (monitor, master) - patch by
+- suppress unsupported iwconfig modes (monitor, master) - patch by
   Pavel Roskin
 
 version 0.10 (2003-06-01)
diff --git a/at76c503-fw_skel.c b/at76c503-fw_skel.c
index 9b7381c..51175fb 100644
--- a/at76c503-fw_skel.c
+++ b/at76c503-fw_skel.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-fw_skel.c,v 1.11 2006/07/13 00:25:33 proski Exp $
+ * $Id: at76c503-fw_skel.c,v 1.12 2006/07/14 06:29:24 proski Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  *
@@ -62,7 +62,7 @@ static int at76c50x_probe(struct usb_interface *interface,
 static void at76c50x_disconnect(struct usb_interface *interface);
 
 
-/* structure for registering this driver with the usb subsystem */
+/* structure for registering this driver with the USB subsystem */
 
 static struct usb_driver module_usb = {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
diff --git a/at76c503-i3861.c b/at76c503-i3861.c
index af7c1e3..22cbd73 100644
--- a/at76c503-i3861.c
+++ b/at76c503-i3861.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-i3861.c,v 1.20 2004/08/18 22:01:45 jal2 Exp $
+ * $Id: at76c503-i3861.c,v 1.21 2006/07/14 06:29:24 proski Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  * design using Intersil 3861 radio chips
@@ -102,7 +102,7 @@ Wireless USB Adapter SMC2662W (v1) */
 /* also Compex WLU11 */
 
 #define VENDOR_ID_INTEL               0x8086 /* Intel */
-#define PRODUCT_ID_INTEL_AP310        0x0200 /* AP310 AnyPoint II usb */
+#define PRODUCT_ID_INTEL_AP310        0x0200 /* AP310 AnyPoint II USB */
 
 #define VENDOR_ID_CONCEPTRONIC        0x0d8e
 #define PRODUCT_ID_CONCEPTRONIC_C11U  0x7100 /* also Dynalink L11U */
diff --git a/at76c503-rfmd.c b/at76c503-rfmd.c
index 2d2aa3d..c4c90bc 100644
--- a/at76c503-rfmd.c
+++ b/at76c503-rfmd.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-rfmd.c,v 1.25 2004/08/18 22:01:45 jal2 Exp $
+ * $Id: at76c503-rfmd.c,v 1.26 2006/07/14 06:29:24 proski Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  * design using RFMD radio chips
@@ -127,7 +127,7 @@ static struct firmware static_fw = {0,NULL};
 #define PRODUCT_ID_PLANEX_GW_US11S      0x3220 /* Planex GW-US11S */
 
 #define VENDOR_ID_COMPAQ                0x049f
-#define PRODUCT_ID_IPAQ_INT_WLAN        0x0032 /* internal wlan adapter in h5[4,5]xx series iPAQs */
+#define PRODUCT_ID_IPAQ_INT_WLAN        0x0032 /* internal WLAN adapter in h5[4,5]xx series iPAQs */
 
 static struct usb_device_id dev_table[] = {
 	{ USB_DEVICE(VENDOR_ID_ATMEL,    PRODUCT_ID_ATMEL_503R        ) },
diff --git a/at76c503.c b/at76c503.c
index a1460b8..da3835f 100644
--- a/at76c503.c
+++ b/at76c503.c
@@ -1,5 +1,5 @@
 /* -*- linux-c -*- */
-/* $Id: at76c503.c,v 1.101 2006/07/14 05:43:47 proski Exp $
+/* $Id: at76c503.c,v 1.102 2006/07/14 06:29:24 proski Exp $
  *
  * USB at76c503/at76c505 driver
  *
@@ -189,7 +189,7 @@ static inline struct urb *alloc_urb(int iso_pk, gfp_t mem_flags) {
 #define DBG_RX_FRAGS        0x00002000 /* rx data fragment handling */
 #define DBG_DEVSTART        0x00004000 /* fw download, device start */
 #define DBG_URB             0x00008000 /* rx urb status, ... */
-#define DBG_RX_ATMEL_HDR    0x00010000 /* the atmel specific header of each rx packet */
+#define DBG_RX_ATMEL_HDR    0x00010000 /* the Atmel specific header of each rx packet */
 #define DBG_PROC_ENTRY      0x00020000 /* procedure entries and exits */
 #define DBG_PM              0x00040000 /* power management settings */
 #define DBG_BSS_MATCH       0x00080000 /* show why a certain bss did not match */
@@ -330,7 +330,7 @@ static const long channel_frequency[] = {
 static const u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
 static const u8 off_addr[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-/* the supported rates of this hardware, bit7 marks a mandantory rate */
+/* the supported rates of this hardware, bit7 marks a basic rate */
 static const u8 hw_rates[4] = {0x82,0x84,0x0b,0x16};
 
 /* the max padding size for tx in bytes (see calc_padding)*/
@@ -1318,7 +1318,7 @@ static int set_promisc(struct at76c503 *dev, int onoff)
 	dev->mib_buf.data[0] = onoff ? 1 : 0;
 	ret = set_mib(dev, &dev->mib_buf);
 	if(ret < 0){
-		err("%s: set_mib (promiscous_mode) failed: %d", dev->netdev->name, ret);
+		err("%s: set_mib (promiscuous_mode) failed: %d", dev->netdev->name, ret);
 	}
 	return ret;
 }
@@ -1950,7 +1950,7 @@ static void handle_mgmt_timeout(struct at76c503 *dev)
 
 	if ((dev->istate != SCANNING && dev->istate != MONITORING) || 
 	     (debug & DBG_MGMT_TIMER))
-		/* this is normal behaviour in states MONITORING, SCANNING ... */
+		/* this is normal behavior in states MONITORING, SCANNING ... */
 		dbg(DBG_PROGRESS, "%s: timeout, state %d", dev->netdev->name,
 		    dev->istate);
 
@@ -1969,7 +1969,7 @@ static void handle_mgmt_timeout(struct at76c503 *dev)
 			   BEACON_TIMEOUT seconds */
 		info("%s: lost beacon bssid %s",
 		     dev->netdev->name, mac2str(dev->curr_bss->bssid));
-		/* jal: starting mgmt_timer in adhoc mode is questionable, 
+		/* jal: starting mgmt_timer in ad-hoc mode is questionable, 
 		   but I'll leave it here to track down another lockup problem */
 		if (dev->iw_mode != IW_MODE_ADHOC) {
 			netif_carrier_off(dev->netdev);
@@ -2266,7 +2266,7 @@ static int assoc_req(struct at76c503 *dev, struct bss_info *bss)
 	memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
 	mgmt->seq_ctl = cpu_to_le16(0);
 
-	/* we must set the Privacy bit in the capabilites to assure an
+	/* we must set the Privacy bit in the capabilities to assure an
 	   Agere-based AP with optional WEP transmits encrypted frames
 	   to us.  AP only set the Privacy bit in their capabilities
 	   if WEP is mandatory in the BSS! */
@@ -2349,7 +2349,7 @@ static int reassoc_req(struct at76c503 *dev, struct bss_info *curr_bss,
 	memcpy(mgmt->addr3, new_bss->bssid, ETH_ALEN);
 	mgmt->seq_ctl = cpu_to_le16(0);
 
-	/* we must set the Privacy bit in the capabilites to assure an
+	/* we must set the Privacy bit in the capabilities to assure an
 	   Agere-based AP with optional WEP transmits encrypted frames
 	   to us.  AP only set the Privacy bit in their capabilities
 	   if WEP is mandatory in the BSS! */
@@ -2436,7 +2436,7 @@ static void kevent(void *data)
 			err("usb_clear_halt() failed: %d", ret);
 		else{
 			clear_bit(KEVENT_CTRL_HALT, &dev->kevent_flags);
-			info("usb_clear_halt() succesful");
+			info("usb_clear_halt() successful");
 		}
 	}
 	if(test_bit(KEVENT_NEW_BSS, &dev->kevent_flags)){
@@ -3170,7 +3170,7 @@ static void rx_mgmt_auth(struct at76c503 *dev,
 		    __FUNCTION__, __LINE__);
 		mod_timer(&dev->mgmt_timer,jiffies+HZ);
 	}
-	/* else: ignore AuthFrames to other receipients */
+	/* else: ignore AuthFrames to other recipients */
 } /* rx_mgmt_auth */
 
 static void rx_mgmt_deauth(struct at76c503 *dev,
@@ -3323,7 +3323,7 @@ static void rx_mgmt_beacon(struct at76c503 *dev,
 	// It does not support any more IE_ID types as although IE_ID_TIM may 
 	// be supported (on my AP at least).  
 	// The bdata->data array is about 1500 bytes long but only ~36 of those 
-	// bytes are useful, hence the have_ssid etc optimistaions.
+	// bytes are useful, hence the have_ssid etc optimizations.
 
 	while (keep_going &&
 	       ((int)(data_end(element) - bdata->data) <= varpar_len)) {
@@ -3439,7 +3439,7 @@ static void rx_mgmt(struct at76c503 *dev, struct at76c503_rx_buffer *buf)
 
 	/* update wstats */
 	if (dev->istate != INIT && dev->istate != SCANNING) {
-		/* jal: this is a dirty hack needed by Tim in adhoc mode */
+		/* jal: this is a dirty hack needed by Tim in ad-hoc mode */
 		if (dev->iw_mode == IW_MODE_ADHOC ||
 		    (dev->curr_bss != NULL &&
 		     !memcmp(mgmt->addr3, dev->curr_bss->bssid, ETH_ALEN))) {
@@ -4423,7 +4423,7 @@ static int at76c503_tx(struct sk_buff *skb, struct net_device *netdev)
 	i802_11_hdr->duration_id = cpu_to_le16(0);
 	i802_11_hdr->seq_ctl = cpu_to_le16(0);
 
-	/* setup 'atmel' header */
+	/* setup 'Atmel' header */
 	tx_buffer->wlength = cpu_to_le16(wlen);
 	tx_buffer->tx_rate = dev->txrate; 
         /* for broadcast destination addresses, the firmware 0.100.x 
@@ -5176,7 +5176,7 @@ static int at76c503_iw_handler_set_wap(struct net_device *netdev,
 	dbg(DBG_IOCTL, "%s: SIOCSIWAP - wap/bssid %s", netdev->name, 
 		mac2str(ap_addr->sa_data));
 	
-	// if the incomming address == ff:ff:ff:ff:ff:ff, the user has 
+	// if the incoming address == ff:ff:ff:ff:ff:ff, the user has 
 	// chosen any or auto AP preference
 	if (!memcmp(ap_addr->sa_data, bc_addr, ETH_ALEN)
 		|| !memcmp(ap_addr->sa_data, off_addr, ETH_ALEN)) {
@@ -6391,7 +6391,7 @@ static struct at76c503 *alloc_new_device(struct usb_device *udev,
 	struct at76c503 *dev = NULL;
 	int i;
 
-	/* allocate memory for our device state and intialize it */
+	/* allocate memory for our device state and initialize it */
 	netdev = alloc_etherdev(sizeof(struct at76c503));
 	if (netdev == NULL) {
 		err("out of memory");
@@ -6501,7 +6501,7 @@ static int init_new_device(struct at76c503 *dev)
 	else
 		dev->rx_data_fcs_len = 4;
 
-	info("$Id: at76c503.c,v 1.101 2006/07/14 05:43:47 proski Exp $ compiled %s %s", __DATE__, __TIME__);
+	info("$Id: at76c503.c,v 1.102 2006/07/14 06:29:24 proski Exp $ compiled %s %s", __DATE__, __TIME__);
 	info("firmware version %d.%d.%d #%d (fcs_len %d)",
 	     dev->fw_version.major, dev->fw_version.minor,
 	     dev->fw_version.patch, dev->fw_version.build,
diff --git a/at76c503.h b/at76c503.h
index 04ac161..bfc180e 100644
--- a/at76c503.h
+++ b/at76c503.h
@@ -1,5 +1,5 @@
 /* -*- linux-c -*- */
-/* $Id: at76c503.h,v 1.40 2006/07/09 21:16:00 proski Exp $
+/* $Id: at76c503.h,v 1.41 2006/07/14 06:29:24 proski Exp $
  *
  * Copyright (c) 2002 - 2003 Oliver Kurth
  *           (c) 2003 - 2004 Jörg Albert <joerg.albert@gmx.de>
@@ -482,8 +482,8 @@ struct rx_data_buf {
 #define NR_SUBMIT_RX_TRIES 8
 
 struct at76c503 {
-	struct usb_device *udev;			/* save off the usb device pointer */
-	struct net_device *netdev;			/* save off the net device pointer */
+	struct usb_device *udev;			/* USB device pointer */
+	struct net_device *netdev;			/* net device pointer */
 	struct net_device_stats stats;
 	struct iw_statistics wstats;
 	struct usb_interface *interface;		/* the interface for this device */
diff --git a/at76c503a.spec b/at76c503a.spec
index 6f448b7..33d6589 100644
--- a/at76c503a.spec
+++ b/at76c503a.spec
@@ -26,13 +26,13 @@ This is another driver for the Atmel AT76C503A based USB WLAN adapters.
 #if [ ! -e /usr/src/linux-2.4/.config ]; then
 #  echo "You need to run 'make menuconfig' once in /usr/src/linux-2.4"
 #  echo "Then exit immediately and save the configuration. The "
-#  echo "config file is needed to compile hostap. Thanx."
+#  echo "config file is needed to compile hostap. Thanks."
 #  exit 1
 #fi
 
 %build
 echo "=================================================================="
-echo "Building atmel driver %{PACKVER} for %{KERNELVER}"
+echo "Building Atmel driver %{PACKVER} for %{KERNELVER}"
 echo "Target is %{_target}"
 echo "=================================================================="
 sleep 5
@@ -62,5 +62,5 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Jul 28 2003 Tim Niemueller <tim@niemueller.de>
 - Initial rpm release
-- Wrote spec file and compiled for current RedHat 9 kernel
+- Wrote spec file and compiled for current Red Hat 9 kernel
 
diff --git a/gen_fw.c b/gen_fw.c
index fc3fa64..771e9e1 100644
--- a/gen_fw.c
+++ b/gen_fw.c
@@ -1,4 +1,4 @@
-/* $Id: gen_fw.c,v 1.6 2004/06/15 19:53:42 jal2 Exp $ */
+/* $Id: gen_fw.c,v 1.7 2006/07/14 06:29:24 proski Exp $ */
 
 /* This file includes the old style firmwares and outputs new, binary files. */
 
@@ -40,9 +40,9 @@ typedef struct {
         u32 version;         // firmware version code
         u32 str_offset;      // printable string offset (copyright)
         u32 internal_offset; // internal firmware image offset
-        u32 internal_len;    // internal firmawre image len
+        u32 internal_len;    // internal firmware image length
         u32 external_offset; // external firmware image offset
-        u32 external_len;    // external firmware image len
+        u32 external_len;    // external firmware image length
 } at76c50x_fw_t __attribute__((packed));
 
 #define cpu_to_le32(x) (x)