diff options
-rw-r--r-- | arch/mips/cavium-octeon/executive/cvmx-helper-util.c | 4 | ||||
-rw-r--r-- | arch/mips/include/asm/octeon/cvmx-helper-util.h | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 | ||||
-rw-r--r-- | drivers/hid/Kconfig | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/eicon/divacapi.h | 6 | ||||
-rw-r--r-- | drivers/isdn/hardware/eicon/pc.h | 4 | ||||
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera/mx2_camera.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_main.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 2 | ||||
-rw-r--r-- | drivers/staging/android/binder.h | 2 | ||||
-rw-r--r-- | drivers/staging/octeon/ethernet.c | 2 | ||||
-rw-r--r-- | drivers/tty/ipwireless/hardware.c | 4 | ||||
-rw-r--r-- | include/net/irda/irlmp.h | 2 | ||||
-rw-r--r-- | include/net/irda/irttp.h | 2 | ||||
-rw-r--r-- | net/bluetooth/hci_core.c | 2 | ||||
-rw-r--r-- | net/irda/timer.c | 2 | ||||
-rw-r--r-- | net/sctp/sm_make_chunk.c | 2 |
19 files changed, 25 insertions, 25 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c index 116dea17acf5..dfdfe8bdc9c5 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c | |||
@@ -175,7 +175,7 @@ int cvmx_helper_dump_packet(cvmx_wqe_t *work) | |||
175 | * Packets will begin slowly dropping when there are less than | 175 | * Packets will begin slowly dropping when there are less than |
176 | * this many packet buffers free in FPA 0. | 176 | * this many packet buffers free in FPA 0. |
177 | * @drop_thresh: | 177 | * @drop_thresh: |
178 | * All incomming packets will be dropped when there are less | 178 | * All incoming packets will be dropped when there are less |
179 | * than this many free packet buffers in FPA 0. | 179 | * than this many free packet buffers in FPA 0. |
180 | * Returns Zero on success. Negative on failure | 180 | * Returns Zero on success. Negative on failure |
181 | */ | 181 | */ |
@@ -210,7 +210,7 @@ int cvmx_helper_setup_red_queue(int queue, int pass_thresh, int drop_thresh) | |||
210 | * Packets will begin slowly dropping when there are less than | 210 | * Packets will begin slowly dropping when there are less than |
211 | * this many packet buffers free in FPA 0. | 211 | * this many packet buffers free in FPA 0. |
212 | * @drop_thresh: | 212 | * @drop_thresh: |
213 | * All incomming packets will be dropped when there are less | 213 | * All incoming packets will be dropped when there are less |
214 | * than this many free packet buffers in FPA 0. | 214 | * than this many free packet buffers in FPA 0. |
215 | * Returns Zero on success. Negative on failure | 215 | * Returns Zero on success. Negative on failure |
216 | */ | 216 | */ |
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h index 6a6e52fc22c1..01c8ddd84ff8 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-util.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h | |||
@@ -60,7 +60,7 @@ extern int cvmx_helper_dump_packet(cvmx_wqe_t *work); | |||
60 | * Packets will begin slowly dropping when there are less than | 60 | * Packets will begin slowly dropping when there are less than |
61 | * this many packet buffers free in FPA 0. | 61 | * this many packet buffers free in FPA 0. |
62 | * @drop_thresh: | 62 | * @drop_thresh: |
63 | * All incomming packets will be dropped when there are less | 63 | * All incoming packets will be dropped when there are less |
64 | * than this many free packet buffers in FPA 0. | 64 | * than this many free packet buffers in FPA 0. |
65 | * Returns Zero on success. Negative on failure | 65 | * Returns Zero on success. Negative on failure |
66 | */ | 66 | */ |
@@ -74,7 +74,7 @@ extern int cvmx_helper_setup_red_queue(int queue, int pass_thresh, | |||
74 | * Packets will begin slowly dropping when there are less than | 74 | * Packets will begin slowly dropping when there are less than |
75 | * this many packet buffers free in FPA 0. | 75 | * this many packet buffers free in FPA 0. |
76 | * @drop_thresh: | 76 | * @drop_thresh: |
77 | * All incomming packets will be dropped when there are less | 77 | * All incoming packets will be dropped when there are less |
78 | * than this many free packet buffers in FPA 0. | 78 | * than this many free packet buffers in FPA 0. |
79 | * Returns Zero on success. Negative on failure | 79 | * Returns Zero on success. Negative on failure |
80 | */ | 80 | */ |
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c index 6336bcbd0618..5f0581e713c2 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c | |||
@@ -528,7 +528,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) | |||
528 | if (!test_bit(IBS_STARTED, pcpu->state)) { | 528 | if (!test_bit(IBS_STARTED, pcpu->state)) { |
529 | /* | 529 | /* |
530 | * Catch spurious interrupts after stopping IBS: After | 530 | * Catch spurious interrupts after stopping IBS: After |
531 | * disabling IBS there could be still incomming NMIs | 531 | * disabling IBS there could be still incoming NMIs |
532 | * with samples that even have the valid bit cleared. | 532 | * with samples that even have the valid bit cleared. |
533 | * Mark all this NMIs as handled. | 533 | * Mark all this NMIs as handled. |
534 | */ | 534 | */ |
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 1630150ad2b1..eb325baa738a 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -311,7 +311,7 @@ config HID_LOGITECH_DJ | |||
311 | Say Y if you want support for Logitech Unifying receivers and devices. | 311 | Say Y if you want support for Logitech Unifying receivers and devices. |
312 | Unifying receivers are capable of pairing up to 6 Logitech compliant | 312 | Unifying receivers are capable of pairing up to 6 Logitech compliant |
313 | devices to the same receiver. Without this driver it will be handled by | 313 | devices to the same receiver. Without this driver it will be handled by |
314 | generic USB_HID driver and all incomming events will be multiplexed | 314 | generic USB_HID driver and all incoming events will be multiplexed |
315 | into a single mouse and a single keyboard device. | 315 | into a single mouse and a single keyboard device. |
316 | 316 | ||
317 | config LOGITECH_FF | 317 | config LOGITECH_FF |
diff --git a/drivers/isdn/hardware/eicon/divacapi.h b/drivers/isdn/hardware/eicon/divacapi.h index 3942efbbfb58..a315a2914d70 100644 --- a/drivers/isdn/hardware/eicon/divacapi.h +++ b/drivers/isdn/hardware/eicon/divacapi.h | |||
@@ -422,11 +422,11 @@ struct _DIVA_CAPI_ADAPTER { | |||
422 | #define LAPD 6 /* lapd (Q.921) */ | 422 | #define LAPD 6 /* lapd (Q.921) */ |
423 | #define X25_L2 7 /* x.25 layer-2 */ | 423 | #define X25_L2 7 /* x.25 layer-2 */ |
424 | #define V120_L2 8 /* V.120 layer-2 protocol */ | 424 | #define V120_L2 8 /* V.120 layer-2 protocol */ |
425 | #define V42_IN 9 /* V.42 layer-2 protocol, incomming */ | 425 | #define V42_IN 9 /* V.42 layer-2 protocol, incoming */ |
426 | #define V42 10 /* V.42 layer-2 protocol */ | 426 | #define V42 10 /* V.42 layer-2 protocol */ |
427 | #define MDM_ATP 11 /* AT Parser built in the L2 */ | 427 | #define MDM_ATP 11 /* AT Parser built in the L2 */ |
428 | #define X75_V42BIS 12 /* ISO7776 (X.75 SLP) modified to support V.42 bis compression */ | 428 | #define X75_V42BIS 12 /* ISO7776 (X.75 SLP) modified to support V.42 bis compression */ |
429 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ | 429 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */ |
430 | #define RTPL2 14 /* RTP layer-2 protocol */ | 430 | #define RTPL2 14 /* RTP layer-2 protocol */ |
431 | #define V120_V42BIS 15 /* V.120 layer-2 protocol supporting V.42 bis compression */ | 431 | #define V120_V42BIS 15 /* V.120 layer-2 protocol supporting V.42 bis compression */ |
432 | 432 | ||
@@ -1125,7 +1125,7 @@ extern word li_total_channels; | |||
1125 | | Direction | word | Enable compression/decompression for | | 1125 | | Direction | word | Enable compression/decompression for | |
1126 | | | | 0: All direction | | 1126 | | | | 0: All direction | |
1127 | | | | 1: disable outgoing data | | 1127 | | | | 1: disable outgoing data | |
1128 | | | | 2: disable incomming data | | 1128 | | | | 2: disable incoming data | |
1129 | | | | 3: disable both direction (default) | | 1129 | | | | 3: disable both direction (default) | |
1130 | +---------------------+------+-----------------------------------------+ | 1130 | +---------------------+------+-----------------------------------------+ |
1131 | | Number of code | word | Parameter P1 of V.42bis in accordance | | 1131 | | Number of code | word | Parameter P1 of V.42bis in accordance | |
diff --git a/drivers/isdn/hardware/eicon/pc.h b/drivers/isdn/hardware/eicon/pc.h index 889dc984bbca..329c0c26abfb 100644 --- a/drivers/isdn/hardware/eicon/pc.h +++ b/drivers/isdn/hardware/eicon/pc.h | |||
@@ -419,11 +419,11 @@ struct dual | |||
419 | #define LAPD 6 /* lapd (Q.921) */ | 419 | #define LAPD 6 /* lapd (Q.921) */ |
420 | #define X25_L2 7 /* x.25 layer-2 */ | 420 | #define X25_L2 7 /* x.25 layer-2 */ |
421 | #define V120_L2 8 /* V.120 layer-2 protocol */ | 421 | #define V120_L2 8 /* V.120 layer-2 protocol */ |
422 | #define V42_IN 9 /* V.42 layer-2 protocol, incomming */ | 422 | #define V42_IN 9 /* V.42 layer-2 protocol, incoming */ |
423 | #define V42 10 /* V.42 layer-2 protocol */ | 423 | #define V42 10 /* V.42 layer-2 protocol */ |
424 | #define MDM_ATP 11 /* AT Parser built in the L2 */ | 424 | #define MDM_ATP 11 /* AT Parser built in the L2 */ |
425 | #define X75_V42BIS 12 /* x.75 with V.42bis */ | 425 | #define X75_V42BIS 12 /* x.75 with V.42bis */ |
426 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ | 426 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */ |
427 | #define RTPL2 14 /* RTP layer-2 protocol */ | 427 | #define RTPL2 14 /* RTP layer-2 protocol */ |
428 | #define V120_V42BIS 15 /* V.120 asynchronous mode supporting V.42bis compression */ | 428 | #define V120_V42BIS 15 /* V.120 asynchronous mode supporting V.42bis compression */ |
429 | #define LISTENER 27 /* Layer 2 to listen line */ | 429 | #define LISTENER 27 /* Layer 2 to listen line */ |
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index db50f788855d..d67126dbbb04 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -692,7 +692,7 @@ l1oip_socket_thread(void *data) | |||
692 | hc->sin_remote.sin_addr.s_addr = htonl(hc->remoteip); | 692 | hc->sin_remote.sin_addr.s_addr = htonl(hc->remoteip); |
693 | hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport); | 693 | hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport); |
694 | 694 | ||
695 | /* bind to incomming port */ | 695 | /* bind to incoming port */ |
696 | if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local, | 696 | if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local, |
697 | sizeof(hc->sin_local))) { | 697 | sizeof(hc->sin_local))) { |
698 | printk(KERN_ERR "%s: Failed to bind socket to port %d.\n", | 698 | printk(KERN_ERR "%s: Failed to bind socket to port %d.\n", |
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index 9fd9d1c5b218..4544a0734df3 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c | |||
@@ -312,7 +312,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = { | |||
312 | /* | 312 | /* |
313 | * This is a generic configuration which is valid for most | 313 | * This is a generic configuration which is valid for most |
314 | * prp input-output format combinations. | 314 | * prp input-output format combinations. |
315 | * We set the incomming and outgoing pixelformat to a | 315 | * We set the incoming and outgoing pixelformat to a |
316 | * 16 Bit wide format and adjust the bytesperline | 316 | * 16 Bit wide format and adjust the bytesperline |
317 | * accordingly. With this configuration the inputdata | 317 | * accordingly. With this configuration the inputdata |
318 | * will not be changed by the emma and could be any type | 318 | * will not be changed by the emma and could be any type |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index d5648fc666bd..2bf4c08efad9 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -8498,7 +8498,7 @@ static void bnx2x_set_234_gates(struct bnx2x *bp, bool close) | |||
8498 | (!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) : | 8498 | (!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) : |
8499 | (val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0)); | 8499 | (val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0)); |
8500 | } else { | 8500 | } else { |
8501 | /* Prevent incomming interrupts in IGU */ | 8501 | /* Prevent incoming interrupts in IGU */ |
8502 | val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION); | 8502 | val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION); |
8503 | 8503 | ||
8504 | REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION, | 8504 | REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION, |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c index a52922ed85c1..d09b0d9ca68b 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c | |||
@@ -64,7 +64,7 @@ static const char mlx4_en_version[] = | |||
64 | 64 | ||
65 | /* Enable RSS UDP traffic */ | 65 | /* Enable RSS UDP traffic */ |
66 | MLX4_EN_PARM_INT(udp_rss, 1, | 66 | MLX4_EN_PARM_INT(udp_rss, 1, |
67 | "Enable RSS for incomming UDP traffic or disabled (0)"); | 67 | "Enable RSS for incoming UDP traffic or disabled (0)"); |
68 | 68 | ||
69 | /* Priority pausing */ | 69 | /* Priority pausing */ |
70 | MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]." | 70 | MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]." |
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 84872043b5c6..9cea451a6081 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -993,7 +993,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud) | |||
993 | /* Enable Interuupt */ | 993 | /* Enable Interuupt */ |
994 | self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM | 994 | self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM |
995 | 995 | ||
996 | /* Be ready for incomming frames */ | 996 | /* Be ready for incoming frames */ |
997 | ali_ircc_dma_receive(self); // benajmin 2000/11/8 07:46PM not complete | 997 | ali_ircc_dma_receive(self); // benajmin 2000/11/8 07:46PM not complete |
998 | } | 998 | } |
999 | /* Go to SIR Speed */ | 999 | /* Go to SIR Speed */ |
diff --git a/drivers/staging/android/binder.h b/drivers/staging/android/binder.h index 2f7d195d8b15..629372f89658 100644 --- a/drivers/staging/android/binder.h +++ b/drivers/staging/android/binder.h | |||
@@ -224,7 +224,7 @@ enum BinderDriverReturnProtocol { | |||
224 | BR_SPAWN_LOOPER = _IO('r', 13), | 224 | BR_SPAWN_LOOPER = _IO('r', 13), |
225 | /* | 225 | /* |
226 | * No parameters. The driver has determined that a process has no | 226 | * No parameters. The driver has determined that a process has no |
227 | * threads waiting to service incomming transactions. When a process | 227 | * threads waiting to service incoming transactions. When a process |
228 | * receives this command, it must spawn a new service thread and | 228 | * receives this command, it must spawn a new service thread and |
229 | * register it via bcENTER_LOOPER. | 229 | * register it via bcENTER_LOOPER. |
230 | */ | 230 | */ |
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 683bedc74dde..b595b9ddd536 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c | |||
@@ -72,7 +72,7 @@ int pow_receive_group = 15; | |||
72 | module_param(pow_receive_group, int, 0444); | 72 | module_param(pow_receive_group, int, 0444); |
73 | MODULE_PARM_DESC(pow_receive_group, "\n" | 73 | MODULE_PARM_DESC(pow_receive_group, "\n" |
74 | "\tPOW group to receive packets from. All ethernet hardware\n" | 74 | "\tPOW group to receive packets from. All ethernet hardware\n" |
75 | "\twill be configured to send incomming packets to this POW\n" | 75 | "\twill be configured to send incoming packets to this POW\n" |
76 | "\tgroup. Also any other software can submit packets to this\n" | 76 | "\tgroup. Also any other software can submit packets to this\n" |
77 | "\tgroup for the kernel to process."); | 77 | "\tgroup for the kernel to process."); |
78 | 78 | ||
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c index b4ba0670dc54..97a511f4185d 100644 --- a/drivers/tty/ipwireless/hardware.c +++ b/drivers/tty/ipwireless/hardware.c | |||
@@ -646,7 +646,7 @@ static void queue_received_packet(struct ipw_hardware *hw, | |||
646 | (*assem) = pool_allocate(hw, *assem, length); | 646 | (*assem) = pool_allocate(hw, *assem, length); |
647 | if (!(*assem)) { | 647 | if (!(*assem)) { |
648 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME | 648 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME |
649 | ": no memory for incomming data packet, dropped!\n"); | 649 | ": no memory for incoming data packet, dropped!\n"); |
650 | return; | 650 | return; |
651 | } | 651 | } |
652 | (*assem)->protocol = protocol; | 652 | (*assem)->protocol = protocol; |
@@ -670,7 +670,7 @@ static void queue_received_packet(struct ipw_hardware *hw, | |||
670 | packet = pool_allocate(hw, NULL, length); | 670 | packet = pool_allocate(hw, NULL, length); |
671 | if (!packet) { | 671 | if (!packet) { |
672 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME | 672 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME |
673 | ": no memory for incomming ctrl packet, dropped!\n"); | 673 | ": no memory for incoming ctrl packet, dropped!\n"); |
674 | return; | 674 | return; |
675 | } | 675 | } |
676 | packet->protocol = protocol; | 676 | packet->protocol = protocol; |
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index 591f78631f13..f74109144d3f 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
@@ -278,7 +278,7 @@ static inline int irlmp_lap_tx_queue_full(struct lsap_cb *self) | |||
278 | } | 278 | } |
279 | 279 | ||
280 | /* After doing a irlmp_dup(), this get one of the two socket back into | 280 | /* After doing a irlmp_dup(), this get one of the two socket back into |
281 | * a state where it's waiting incomming connections. | 281 | * a state where it's waiting incoming connections. |
282 | * Note : this can be used *only* if the socket is not yet connected | 282 | * Note : this can be used *only* if the socket is not yet connected |
283 | * (i.e. NO irlmp_connect_response() done on this socket). | 283 | * (i.e. NO irlmp_connect_response() done on this socket). |
284 | * - Jean II */ | 284 | * - Jean II */ |
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h index af4b87721d13..98682d4bae8f 100644 --- a/include/net/irda/irttp.h +++ b/include/net/irda/irttp.h | |||
@@ -185,7 +185,7 @@ static inline __u32 irttp_get_max_seg_size(struct tsap_cb *self) | |||
185 | } | 185 | } |
186 | 186 | ||
187 | /* After doing a irttp_dup(), this get one of the two socket back into | 187 | /* After doing a irttp_dup(), this get one of the two socket back into |
188 | * a state where it's waiting incomming connections. | 188 | * a state where it's waiting incoming connections. |
189 | * Note : this can be used *only* if the socket is not yet connected | 189 | * Note : this can be used *only* if the socket is not yet connected |
190 | * (i.e. NO irttp_connect_response() done on this socket). | 190 | * (i.e. NO irttp_connect_response() done on this socket). |
191 | * - Jean II */ | 191 | * - Jean II */ |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8a0ce706aebd..8de421d28cb5 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1855,7 +1855,7 @@ int hci_recv_frame(struct sk_buff *skb) | |||
1855 | return -ENXIO; | 1855 | return -ENXIO; |
1856 | } | 1856 | } |
1857 | 1857 | ||
1858 | /* Incomming skb */ | 1858 | /* Incoming skb */ |
1859 | bt_cb(skb)->incoming = 1; | 1859 | bt_cb(skb)->incoming = 1; |
1860 | 1860 | ||
1861 | /* Time stamp */ | 1861 | /* Time stamp */ |
diff --git a/net/irda/timer.c b/net/irda/timer.c index 1d552b3946fc..0c4c115a5cab 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c | |||
@@ -57,7 +57,7 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s) | |||
57 | * Basically, we multiply the number of remaining slots by our | 57 | * Basically, we multiply the number of remaining slots by our |
58 | * slot time, plus add some extra time to properly receive the last | 58 | * slot time, plus add some extra time to properly receive the last |
59 | * discovery packet (which is longer due to extra discovery info), | 59 | * discovery packet (which is longer due to extra discovery info), |
60 | * to avoid messing with for incomming connections requests and | 60 | * to avoid messing with for incoming connections requests and |
61 | * to accommodate devices that perform discovery slower than us. | 61 | * to accommodate devices that perform discovery slower than us. |
62 | * Jean II */ | 62 | * Jean II */ |
63 | timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) | 63 | timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index fbe1636309a7..16a10850ed39 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -1181,7 +1181,7 @@ nodata: | |||
1181 | * specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) | 1181 | * specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) |
1182 | * This is a helper function to allocate an error chunk for | 1182 | * This is a helper function to allocate an error chunk for |
1183 | * for those invalid parameter codes in which we may not want | 1183 | * for those invalid parameter codes in which we may not want |
1184 | * to report all the errors, if the incomming chunk is large | 1184 | * to report all the errors, if the incoming chunk is large |
1185 | */ | 1185 | */ |
1186 | static inline struct sctp_chunk *sctp_make_op_error_fixed( | 1186 | static inline struct sctp_chunk *sctp_make_op_error_fixed( |
1187 | const struct sctp_association *asoc, | 1187 | const struct sctp_association *asoc, |