aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
commitf5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch)
tree7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/net
parent9853832c49dc1685587abeb4e1decd4be690d256 (diff)
parent1560a79a2c2ea0c3826150da8029991d685de990 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits) Jesper Juhl is the new trivial patches maintainer Documentation: mention email-clients.txt in SubmittingPatches fs/binfmt_elf.c: spello fix do_invalidatepage() comment typo fix Documentation/filesystems/porting fixes typo fixes in net/core/net_namespace.c typo fix in net/rfkill/rfkill.c typo fixes in net/sctp/sm_statefuns.c lib/: Spelling fixes kernel/: Spelling fixes include/scsi/: Spelling fixes include/linux/: Spelling fixes include/asm-m68knommu/: Spelling fixes include/asm-frv/: Spelling fixes fs/: Spelling fixes drivers/watchdog/: Spelling fixes drivers/video/: Spelling fixes drivers/ssb/: Spelling fixes drivers/serial/: Spelling fixes drivers/scsi/: Spelling fixes ...
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/eexpress.c2
-rw-r--r--drivers/net/irda/ali-ircc.h4
-rw-r--r--drivers/net/irda/nsc-ircc.h4
-rw-r--r--drivers/net/irda/via-ircc.h4
-rw-r--r--drivers/net/lib8390.c2
-rw-r--r--drivers/net/skfp/ess.c2
-rw-r--r--drivers/net/skfp/fplustm.c2
-rw-r--r--drivers/net/skfp/hwmtm.c2
-rw-r--r--drivers/net/tokenring/abyss.c2
-rw-r--r--drivers/net/tokenring/abyss.h2
-rw-r--r--drivers/net/tokenring/madgemc.c2
-rw-r--r--drivers/net/tokenring/madgemc.h2
-rw-r--r--drivers/net/tokenring/proteon.c2
-rw-r--r--drivers/net/tokenring/skisa.c2
-rw-r--r--drivers/net/tokenring/tms380tr.c2
-rw-r--r--drivers/net/tokenring/tms380tr.h2
-rw-r--r--drivers/net/tokenring/tmspci.c2
-rw-r--r--drivers/net/wan/cycx_drv.c4
-rw-r--r--drivers/net/wireless/libertas/scan.c2
19 files changed, 23 insertions, 23 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index d5459a8056b1..2eb82aba4a8b 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -9,7 +9,7 @@
9 * Many modifications, and currently maintained, by 9 * Many modifications, and currently maintained, by
10 * Philip Blundell <philb@gnu.org> 10 * Philip Blundell <philb@gnu.org>
11 * Added the Compaq LTE Alan Cox <alan@redhat.com> 11 * Added the Compaq LTE Alan Cox <alan@redhat.com>
12 * Added MCA support Adam Fritzler <mid@auk.cx> 12 * Added MCA support Adam Fritzler
13 * 13 *
14 * Note - this driver is experimental still - it has problems on faster 14 * Note - this driver is experimental still - it has problems on faster
15 * machines. Someone needs to sit down and go through it line by line with 15 * machines. Someone needs to sit down and go through it line by line with
diff --git a/drivers/net/irda/ali-ircc.h b/drivers/net/irda/ali-ircc.h
index e489c6661ee8..07876578887f 100644
--- a/drivers/net/irda/ali-ircc.h
+++ b/drivers/net/irda/ali-ircc.h
@@ -173,13 +173,13 @@ struct st_fifo {
173 173
174struct frame_cb { 174struct frame_cb {
175 void *start; /* Start of frame in DMA mem */ 175 void *start; /* Start of frame in DMA mem */
176 int len; /* Lenght of frame in DMA mem */ 176 int len; /* Length of frame in DMA mem */
177}; 177};
178 178
179struct tx_fifo { 179struct tx_fifo {
180 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ 180 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */
181 int ptr; /* Currently being sent */ 181 int ptr; /* Currently being sent */
182 int len; /* Lenght of queue */ 182 int len; /* Length of queue */
183 int free; /* Next free slot */ 183 int free; /* Next free slot */
184 void *tail; /* Next free start in DMA mem */ 184 void *tail; /* Next free start in DMA mem */
185}; 185};
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
index bbdc97ff83ca..29398a4f73fd 100644
--- a/drivers/net/irda/nsc-ircc.h
+++ b/drivers/net/irda/nsc-ircc.h
@@ -231,13 +231,13 @@ struct st_fifo {
231 231
232struct frame_cb { 232struct frame_cb {
233 void *start; /* Start of frame in DMA mem */ 233 void *start; /* Start of frame in DMA mem */
234 int len; /* Lenght of frame in DMA mem */ 234 int len; /* Length of frame in DMA mem */
235}; 235};
236 236
237struct tx_fifo { 237struct tx_fifo {
238 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ 238 struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */
239 int ptr; /* Currently being sent */ 239 int ptr; /* Currently being sent */
240 int len; /* Lenght of queue */ 240 int len; /* Length of queue */
241 int free; /* Next free slot */ 241 int free; /* Next free slot */
242 void *tail; /* Next free start in DMA mem */ 242 void *tail; /* Next free start in DMA mem */
243}; 243};
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h
index 204b1b34ffc7..9d012f0dbd30 100644
--- a/drivers/net/irda/via-ircc.h
+++ b/drivers/net/irda/via-ircc.h
@@ -54,13 +54,13 @@ struct st_fifo {
54 54
55struct frame_cb { 55struct frame_cb {
56 void *start; /* Start of frame in DMA mem */ 56 void *start; /* Start of frame in DMA mem */
57 int len; /* Lenght of frame in DMA mem */ 57 int len; /* Length of frame in DMA mem */
58}; 58};
59 59
60struct tx_fifo { 60struct tx_fifo {
61 struct frame_cb queue[MAX_TX_WINDOW + 2]; /* Info about frames in queue */ 61 struct frame_cb queue[MAX_TX_WINDOW + 2]; /* Info about frames in queue */
62 int ptr; /* Currently being sent */ 62 int ptr; /* Currently being sent */
63 int len; /* Lenght of queue */ 63 int len; /* Length of queue */
64 int free; /* Next free slot */ 64 int free; /* Next free slot */
65 void *tail; /* Next free start in DMA mem */ 65 void *tail; /* Next free start in DMA mem */
66}; 66};
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index c429a5002dd6..0c5447dac03b 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/lib8390.c
@@ -148,7 +148,7 @@ static void __NS8390_init(struct net_device *dev, int startp);
148 * 148 *
149 * "The author (me) didn't use spin_lock_irqsave because the slowness of the 149 * "The author (me) didn't use spin_lock_irqsave because the slowness of the
150 * card means that approach caused horrible problems like losing serial data 150 * card means that approach caused horrible problems like losing serial data
151 * at 38400 baud on some chips. Rememeber many 8390 nics on PCI were ISA 151 * at 38400 baud on some chips. Remember many 8390 nics on PCI were ISA
152 * chips with FPGA front ends. 152 * chips with FPGA front ends.
153 * 153 *
154 * Ok the logic behind the 8390 is very simple: 154 * Ok the logic behind the 8390 is very simple:
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c
index 62b01328c496..889f98724610 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
@@ -598,7 +598,7 @@ static void ess_send_alc_req(struct s_smc *smc)
598 req->cmd.sba_cmd = REQUEST_ALLOCATION ; 598 req->cmd.sba_cmd = REQUEST_ALLOCATION ;
599 599
600 /* 600 /*
601 * set the parameter type and parameter lenght of all used 601 * set the parameter type and parameter length of all used
602 * parameters 602 * parameters
603 */ 603 */
604 604
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index a45205da8033..76dc8adc9441 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -398,7 +398,7 @@ static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
398/* u_long td; transmit descriptor */ 398/* u_long td; transmit descriptor */
399/* struct fddi_mac *mac; mac frame pointer */ 399/* struct fddi_mac *mac; mac frame pointer */
400/* unsigned off; start address within buffer memory */ 400/* unsigned off; start address within buffer memory */
401/* int len ; lenght of the frame including the FC */ 401/* int len ; length of the frame including the FC */
402{ 402{
403 int i ; 403 int i ;
404 u_int *p ; 404 u_int *p ;
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c
index 8a430a366547..46e339315656 100644
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/skfp/hwmtm.c
@@ -1185,7 +1185,7 @@ void process_receive(struct s_smc *smc)
1185 1185
1186 DB_RX("frame length = %d",len,0,4) ; 1186 DB_RX("frame length = %d",len,0,4) ;
1187 /* 1187 /*
1188 * check the frame_lenght and all error flags 1188 * check the frame_length and all error flags
1189 */ 1189 */
1190 if (rfsw & (RX_MSRABT|RX_FS_E|RX_FS_CRC|RX_FS_IMPL)){ 1190 if (rfsw & (RX_MSRABT|RX_FS_E|RX_FS_CRC|RX_FS_IMPL)){
1191 if (rfsw & RD_S_MSRABT) { 1191 if (rfsw & RD_S_MSRABT) {
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 124cfd4fbcf4..7a7de0469eae 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -10,7 +10,7 @@
10 * - Madge Smart 16/4 PCI Mk2 10 * - Madge Smart 16/4 PCI Mk2
11 * 11 *
12 * Maintainer(s): 12 * Maintainer(s):
13 * AF Adam Fritzler mid@auk.cx 13 * AF Adam Fritzler
14 * 14 *
15 * Modification History: 15 * Modification History:
16 * 30-Dec-99 AF Split off from the tms380tr driver. 16 * 30-Dec-99 AF Split off from the tms380tr driver.
diff --git a/drivers/net/tokenring/abyss.h b/drivers/net/tokenring/abyss.h
index 0ee6e4f085b1..b0a473b89133 100644
--- a/drivers/net/tokenring/abyss.h
+++ b/drivers/net/tokenring/abyss.h
@@ -2,7 +2,7 @@
2 * abyss.h: Header for the abyss tms380tr module 2 * abyss.h: Header for the abyss tms380tr module
3 * 3 *
4 * Authors: 4 * Authors:
5 * - Adam Fritzler <mid@auk.cx> 5 * - Adam Fritzler
6 */ 6 */
7 7
8#ifndef __LINUX_MADGETR_H 8#ifndef __LINUX_MADGETR_H
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 5a4151362fc0..c9c5a2b1ed9e 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -11,7 +11,7 @@
11 * - Madge Smart 16/4 Ringnode MC32 (??) 11 * - Madge Smart 16/4 Ringnode MC32 (??)
12 * 12 *
13 * Maintainer(s): 13 * Maintainer(s):
14 * AF Adam Fritzler mid@auk.cx 14 * AF Adam Fritzler
15 * 15 *
16 * Modification History: 16 * Modification History:
17 * 16-Jan-00 AF Created 17 * 16-Jan-00 AF Created
diff --git a/drivers/net/tokenring/madgemc.h b/drivers/net/tokenring/madgemc.h
index 2dd822203809..fe88e272c531 100644
--- a/drivers/net/tokenring/madgemc.h
+++ b/drivers/net/tokenring/madgemc.h
@@ -2,7 +2,7 @@
2 * madgemc.h: Header for the madgemc tms380tr module 2 * madgemc.h: Header for the madgemc tms380tr module
3 * 3 *
4 * Authors: 4 * Authors:
5 * - Adam Fritzler <mid@auk.cx> 5 * - Adam Fritzler
6 */ 6 */
7 7
8#ifndef __LINUX_MADGEMC_H 8#ifndef __LINUX_MADGEMC_H
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index ca6b65919b3d..00ea94513460 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -12,7 +12,7 @@
12 * - Proteon 1392, 1392+ 12 * - Proteon 1392, 1392+
13 * 13 *
14 * Maintainer(s): 14 * Maintainer(s):
15 * AF Adam Fritzler mid@auk.cx 15 * AF Adam Fritzler
16 * JF Jochen Friedrich jochen@scram.de 16 * JF Jochen Friedrich jochen@scram.de
17 * 17 *
18 * Modification History: 18 * Modification History:
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 32e8d5a9f958..41b6999a0f33 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -13,7 +13,7 @@
13 * - SysKonnect TR4/16(+) ISA (SK-4190) 13 * - SysKonnect TR4/16(+) ISA (SK-4190)
14 * 14 *
15 * Maintainer(s): 15 * Maintainer(s):
16 * AF Adam Fritzler mid@auk.cx 16 * AF Adam Fritzler
17 * JF Jochen Friedrich jochen@scram.de 17 * JF Jochen Friedrich jochen@scram.de
18 * 18 *
19 * Modification History: 19 * Modification History:
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index d5fa36d36515..d07c4523c847 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -30,7 +30,7 @@
30 * Maintainer(s): 30 * Maintainer(s):
31 * JS Jay Schulist jschlst@samba.org 31 * JS Jay Schulist jschlst@samba.org
32 * CG Christoph Goos cgoos@syskonnect.de 32 * CG Christoph Goos cgoos@syskonnect.de
33 * AF Adam Fritzler mid@auk.cx 33 * AF Adam Fritzler
34 * MLP Mike Phillips phillim@amtrak.com 34 * MLP Mike Phillips phillim@amtrak.com
35 * JF Jochen Friedrich jochen@scram.de 35 * JF Jochen Friedrich jochen@scram.de
36 * 36 *
diff --git a/drivers/net/tokenring/tms380tr.h b/drivers/net/tokenring/tms380tr.h
index 7daf74e31ccd..7af76d708849 100644
--- a/drivers/net/tokenring/tms380tr.h
+++ b/drivers/net/tokenring/tms380tr.h
@@ -3,7 +3,7 @@
3 * 3 *
4 * Authors: 4 * Authors:
5 * - Christoph Goos <cgoos@syskonnect.de> 5 * - Christoph Goos <cgoos@syskonnect.de>
6 * - Adam Fritzler <mid@auk.cx> 6 * - Adam Fritzler
7 */ 7 */
8 8
9#ifndef __LINUX_TMS380TR_H 9#ifndef __LINUX_TMS380TR_H
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index 1c18f782f522..5f0ee880cfff 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -14,7 +14,7 @@
14 * - 3Com 3C339 Token Link Velocity 14 * - 3Com 3C339 Token Link Velocity
15 * 15 *
16 * Maintainer(s): 16 * Maintainer(s):
17 * AF Adam Fritzler mid@auk.cx 17 * AF Adam Fritzler
18 * 18 *
19 * Modification History: 19 * Modification History:
20 * 30-Dec-99 AF Split off from the tms380tr driver. 20 * 30-Dec-99 AF Split off from the tms380tr driver.
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c
index d347d59db656..d14e6678deed 100644
--- a/drivers/net/wan/cycx_drv.c
+++ b/drivers/net/wan/cycx_drv.c
@@ -322,7 +322,7 @@ static int cycx_data_boot(void __iomem *addr, u8 *code, u32 len)
322 void __iomem *pt_boot_cmd = addr + CMD_OFFSET; 322 void __iomem *pt_boot_cmd = addr + CMD_OFFSET;
323 u32 i; 323 u32 i;
324 324
325 /* boot buffer lenght */ 325 /* boot buffer length */
326 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); 326 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16));
327 writew(GEN_DEFPAR, pt_boot_cmd); 327 writew(GEN_DEFPAR, pt_boot_cmd);
328 328
@@ -353,7 +353,7 @@ static int cycx_code_boot(void __iomem *addr, u8 *code, u32 len)
353 void __iomem *pt_boot_cmd = addr + CMD_OFFSET; 353 void __iomem *pt_boot_cmd = addr + CMD_OFFSET;
354 u32 i; 354 u32 i;
355 355
356 /* boot buffer lenght */ 356 /* boot buffer length */
357 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); 357 writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16));
358 writew(GEN_DEFPAR, pt_boot_cmd); 358 writew(GEN_DEFPAR, pt_boot_cmd);
359 359
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 9a61188b62e9..69f94c92b32d 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -1473,7 +1473,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info,
1473 * Called via lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, ...) 1473 * Called via lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, ...)
1474 * from cmd.c 1474 * from cmd.c
1475 * 1475 *
1476 * Sends a fixed lenght data part (specifying the BSS type and BSSID filters) 1476 * Sends a fixed length data part (specifying the BSS type and BSSID filters)
1477 * as well as a variable number/length of TLVs to the firmware. 1477 * as well as a variable number/length of TLVs to the firmware.
1478 * 1478 *
1479 * @param priv A pointer to struct lbs_private structure 1479 * @param priv A pointer to struct lbs_private structure