diff options
| author | Michael Hayes <mike@aiinc.ca> | 2003-02-24 03:58:06 -0800 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2003-02-24 03:58:06 -0800 |
| commit | bfc2b3aa6634326a9dae42b862b2587cd79cd5c1 (patch) | |
| tree | a68c42dc484ba98d6d2b8609be94e9e15571eec6 | |
| parent | d4b21f44d51c570a9aac3844ecc8147db15e5899 (diff) | |
[PATCH] Spelling fixes - necessary
This fixes:
neccessary -> necessary
unneccessary -> unnecessary
Fixes 46 occurrences in all.
39 files changed, 46 insertions, 46 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/i386/kernel/cpu/cpufreq/longrun.c index e7755e874eb9..c86b0c466744 100644 --- a/arch/i386/kernel/cpu/cpufreq/longrun.c +++ b/arch/i386/kernel/cpu/cpufreq/longrun.c @@ -133,7 +133,7 @@ static int longrun_verify_policy(struct cpufreq_policy *policy) * longrun_determine_freqs - determines the lowest and highest possible core frequency * * Determines the lowest and highest possible core frequencies on this CPU. - * This is neccessary to calculate the performance percentage according to + * This is necessary to calculate the performance percentage according to * TMTA rules: * performance_pctg = (target_freq - low_freq)/(high_freq - low_freq) */ diff --git a/arch/i386/kernel/suspend.c b/arch/i386/kernel/suspend.c index cca0d136f36c..427b387efcf7 100644 --- a/arch/i386/kernel/suspend.c +++ b/arch/i386/kernel/suspend.c @@ -113,7 +113,7 @@ void fix_processor_context(void) int cpu = smp_processor_id(); struct tss_struct * t = init_tss + cpu; - set_tss_desc(cpu,t); /* This just modifies memory; should not be neccessary. But... This is neccessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ + set_tss_desc(cpu,t); /* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ cpu_gdt_table[cpu][GDT_ENTRY_TSS].b &= 0xfffffdff; load_TR_desc(); /* This does ltr */ diff --git a/arch/mips/au1000/common/serial.c b/arch/mips/au1000/common/serial.c index 64d0ae0299ed..84a926570f13 100644 --- a/arch/mips/au1000/common/serial.c +++ b/arch/mips/au1000/common/serial.c @@ -2703,7 +2703,7 @@ static int __init rs_init(void) * port exists and is in use an error is returned. If the port * is not currently in the table it is added. * - * The port is then probed and if neccessary the IRQ is autodetected + * The port is then probed and if necessary the IRQ is autodetected * If this fails an error is returned. * * On success the port is ready to use and the line number is returned. diff --git a/arch/sh/kernel/pci-dma.c b/arch/sh/kernel/pci-dma.c index f941c3332e92..be0745b162c1 100644 --- a/arch/sh/kernel/pci-dma.c +++ b/arch/sh/kernel/pci-dma.c @@ -24,7 +24,7 @@ void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, ret = (void *) __get_free_pages(gfp, get_order(size)); if (ret != NULL) { - /* Is it neccessary to do the memset? */ + /* Is it necessary to do the memset? */ memset(ret, 0, size); *dma_handle = virt_to_bus(ret); } diff --git a/arch/sh/stboards/pcidma.c b/arch/sh/stboards/pcidma.c index 475311390fd6..bbaaded9cff5 100644 --- a/arch/sh/stboards/pcidma.c +++ b/arch/sh/stboards/pcidma.c @@ -24,7 +24,7 @@ void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, ret = (void *) __get_free_pages(gfp, get_order(size)); if (ret != NULL) { - /* Is it neccessary to do the memset? */ + /* Is it necessary to do the memset? */ memset(ret, 0, size); *dma_handle = virt_to_bus(ret); } diff --git a/drivers/char/ftape/zftape/zftape-write.c b/drivers/char/ftape/zftape/zftape-write.c index 4f919a1d6c09..43129fdf0b0f 100644 --- a/drivers/char/ftape/zftape/zftape-write.c +++ b/drivers/char/ftape/zftape/zftape-write.c @@ -357,7 +357,7 @@ static int check_write_access(int req_len, *volume = zft_find_volume(pos->seg_pos); DUMP_VOLINFO(ft_t_noise, "", *volume); zft_just_before_eof = 0; - /* now merge with old data if neccessary */ + /* now merge with old data if necessary */ if (!zft_qic_mode && pos->seg_byte_pos != 0){ result = zft_fetch_segment(pos->seg_pos, zft_deblock_buf, diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index f212b0123c19..ad770bc0e537 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -196,9 +196,9 @@ EXPORT_SYMBOL_GPL(ide_dma_intr); * @drive: the drive to build the DMA table for * @rq: the request holding the sg list * - * Perform the PCI mapping magic neccessary to access the source or + * Perform the PCI mapping magic necessary to access the source or * target buffers of a request via PCI DMA. The lower layers of the - * kernel provide the neccessary cache management so that we can + * kernel provide the necessary cache management so that we can * operate in a portable fashion */ @@ -226,9 +226,9 @@ static int ide_build_sglist (ide_drive_t *drive, struct request *rq) * @drive: the drive to build the DMA table for * @rq: the request holding the sg list * - * Perform the PCI mapping magic neccessary to access the source or + * Perform the PCI mapping magic necessary to access the source or * target buffers of a taskfile request via PCI DMA. The lower layers - * of the kernel provide the neccessary cache management so that we can + * of the kernel provide the necessary cache management so that we can * operate in a portable fashion */ diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 64ee462aaa97..03b16beb9f67 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -379,7 +379,7 @@ EXPORT_SYMBOL(ide_cmd); * @drive: drive the completion interrupt occurred on * * drive_cmd_intr() is invoked on completion of a special DRIVE_CMD. - * We do any neccessary daya reading and then wait for the drive to + * We do any necessary daya reading and then wait for the drive to * go non busy. At that point we may read the error data and complete * the request */ @@ -652,7 +652,7 @@ EXPORT_SYMBOL(ide_stall_queue); * @hwgroup: hardware group to select on * * choose_drive() selects the next drive which will be serviced. - * This is neccessary because the IDE layer can't issue commands + * This is necessary because the IDE layer can't issue commands * to both drives on the same cable, unlike SCSI. */ diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 8efb3067b435..ac88b17d4065 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -470,7 +470,7 @@ fixup_address: * @hwif: Hardware interface we are configuring * * Set up the DMA base for the interface. Enable the master bits as - * neccessary and attempt to bring the device DMA into a ready to use + * necessary and attempt to bring the device DMA into a ready to use * state */ @@ -573,7 +573,7 @@ static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, in * @index: ata index to update * * Scan the interfaces attached to this device and do any - * neccessary per port setup. Attach the devices and ask the + * necessary per port setup. Attach the devices and ask the * generic DMA layer to do its work for us. * * Normally called automaticall from do_ide_pci_setup_device, diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c index 24ecbe874467..72b0c7e03e7d 100644 --- a/drivers/isdn/hisax/amd7930_fn.c +++ b/drivers/isdn/hisax/amd7930_fn.c @@ -42,7 +42,7 @@ * * Credits: * Programming the driver for Formula-n enter:now ISDN PCI and - * neccessary this driver for the used Amd 7930 D-channel-controller + * necessary this driver for the used Amd 7930 D-channel-controller * was spnsored by Formula-n Europe AG. * Thanks to Karsten Keil and Petr Novak, who gave me support in * Hisax-specific questions. diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 913ff14167c8..7585bb59f1ba 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -49,7 +49,7 @@ * * Credits: * Programming the driver for Formula-n enter:now ISDN PCI and - * neccessary the driver for the used Amd 7930 D-channel-controller + * necessary the driver for the used Amd 7930 D-channel-controller * was spnsored by Formula-n Europe AG. * Thanks to Karsten Keil and Petr Novak, who gave me support in * Hisax-specific questions. diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index dd3860405be2..70ef023f8ff3 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c @@ -521,7 +521,7 @@ hycapi_rx_capipkt Receive a capi-message. All B3_DATA_IND are converted to 64K-extension compatible format. -New nccis are created if neccessary. +New nccis are created if necessary. *******************************************************************/ void diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 1566186325cc..cf5a7b05918c 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -499,7 +499,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start, } /* - * Decrement a devices use count and remove it if neccessary. + * Decrement a devices use count and remove it if necessary. */ void dm_put_device(struct dm_target *ti, struct dm_dev *dd) { diff --git a/drivers/message/i2o/i2o_core.c b/drivers/message/i2o/i2o_core.c index 93ce837e421c..dc78d1da2b36 100644 --- a/drivers/message/i2o/i2o_core.c +++ b/drivers/message/i2o/i2o_core.c @@ -2120,7 +2120,7 @@ static void i2o_sys_shutdown(void) * @iop: controller * * This function brings an I2O controller into HOLD state. The adapter - * is reset if neccessary and then the queues and resource table + * is reset if necessary and then the queues and resource table * are read. -1 is returned on a failure, 0 on success. * */ diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index a6526037a62a..0924264996a3 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c @@ -1168,7 +1168,7 @@ static void mc32_update_stats(struct net_device *dev) * the stack or, if the packet is near MTU sized, we allocate * another buffer and flip the old one up the stack. * - * We must succeed in keeping a buffer on the ring. If neccessary we + * We must succeed in keeping a buffer on the ring. If necessary we * will toss a received packet rather than lose a ring entry. Once * the first uncompleted descriptor is found, we move the * End-Of-List bit to include the buffers just processed. diff --git a/drivers/net/8390.c b/drivers/net/8390.c index 17b108c09f03..bcd9ce09df88 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c @@ -417,7 +417,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) * Handle the ether interface interrupts. We pull packets from * the 8390 via the card specific functions and fire them at the networking * stack. We also handle transmit completions and wake the transmit path if - * neccessary. We also update the counters and do other housekeeping as + * necessary. We also update the counters and do other housekeeping as * needed. */ diff --git a/drivers/net/e100/e100_config.c b/drivers/net/e100/e100_config.c index 3cd58243ebd8..bff330628916 100644 --- a/drivers/net/e100/e100_config.c +++ b/drivers/net/e100/e100_config.c @@ -149,7 +149,7 @@ e100_config_init_82550(struct e100_private *bdp) * 32 from the RFD base address, instead of at offset 16. */ bdp->config[7] |= CB_CFIG_EXTENDED_RFD; - /* put the chip into D102 receive mode. This is neccessary + /* put the chip into D102 receive mode. This is necessary * for any parsing and offloading features. */ bdp->config[22] = CB_CFIG_RECEIVE_GAMLA_MODE; diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 5a89478b13d9..43e30d7b3815 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -1341,7 +1341,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) * Handle the ether interface interrupts. We pull packets from * the 8390 via the card specific functions and fire them at the networking * stack. We also handle transmit completions and wake the transmit path if - * neccessary. We also update the counters and do other housekeeping as + * necessary. We also update the counters and do other housekeeping as * needed. */ diff --git a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h index 4f8e30868e9f..f055f98fa379 100644 --- a/drivers/net/sk98lin/h/skdrv1st.h +++ b/drivers/net/sk98lin/h/skdrv1st.h @@ -72,7 +72,7 @@ * Description: * * This is the first include file of the driver, which includes all - * neccessary system header files and some of the GEnesis header files. + * necessary system header files and some of the GEnesis header files. * It also defines some basic items. * * Include File Hierarchy: diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h index 97f24392a949..e524a4686108 100644 --- a/drivers/net/sk98lin/h/skdrv2nd.h +++ b/drivers/net/sk98lin/h/skdrv2nd.h @@ -85,7 +85,7 @@ * Description: * * This is the second include file of the driver, which includes all other - * neccessary files and defines all structures and constants used by the + * necessary files and defines all structures and constants used by the * driver and the common modules. * * Include File Hierarchy: diff --git a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c index 26a5dea873c6..65a0da869042 100644 --- a/drivers/net/sk98lin/skgehwt.c +++ b/drivers/net/sk98lin/skgehwt.c @@ -61,14 +61,14 @@ * fix: chg pAc -> pAC * * Revision 1.4 1998/08/10 14:14:52 gklug - * rmv: unneccessary SK_ADDR macro + * rmv: unnecessary SK_ADDR macro * * Revision 1.3 1998/08/07 12:53:44 gklug * fix: first compiled version * * Revision 1.2 1998/08/07 09:19:29 gklug * adapt functions to the C coding conventions - * rmv unneccessary functions. + * rmv unnecessary functions. * * Revision 1.1 1998/08/05 11:28:36 gklug * first version: adapted from SMT/FDDI diff --git a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c index f5fbd7642c58..17e0ff982444 100644 --- a/drivers/net/sk98lin/ski2c.c +++ b/drivers/net/sk98lin/ski2c.c @@ -178,7 +178,7 @@ * Revision 1.2 1998/08/11 07:27:15 gklug * add: functions of the interface * adapt rest of source to C coding Conventions - * rmv: unneccessary code taken from Mona Lisa + * rmv: unnecessary code taken from Mona Lisa * * Revision 1.1 1998/06/19 14:28:43 malthoff * Created. Sources taken from ML Projekt. diff --git a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c index 67c2fa53361a..24178522d85a 100644 --- a/drivers/net/sk98lin/skxmac2.c +++ b/drivers/net/sk98lin/skxmac2.c @@ -596,7 +596,7 @@ int Port) /* port to stop (MAC_1 + n) */ * none, National: 80ns). * * ATTENTION: - * It is absolutely neccessary to reset the SW_RST Bit first + * It is absolutely necessary to reset the SW_RST Bit first * before calling this function. * * Returns: diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index 59d584a40c86..4b6259951c0d 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c @@ -197,7 +197,7 @@ dasd_3990_erp_examine(dasd_ccw_req_t * cqr, struct irb * irb) * DASD_3990_ERP_CLEANUP * * DESCRIPTION - * Removes the already build but not neccessary ERP request and sets + * Removes the already build but not necessary ERP request and sets * the status of the original cqr / erp to the given (final) status * * PARAMETER diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index ad05de941f34..99755d1a6f1a 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c @@ -10866,7 +10866,7 @@ int DiagBusMaster(ULONG port) * Function: DiagEEPROM * * Description: Verfiy checksum and 'Key' and initialize the EEPROM if - * neccessary. + * necessary. * *---------------------------------------------------------------------*/ diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c index cda75b428d50..14c983e278d4 100644 --- a/drivers/scsi/oktagon_esp.c +++ b/drivers/scsi/oktagon_esp.c @@ -245,7 +245,7 @@ oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x) if((code == SYS_DOWN || code == SYS_HALT) && (esp = current_esp)) { esp_bootup_reset(esp,esp->eregs); - udelay(500); /* Settle time. Maybe unneccessary. */ + udelay(500); /* Settle time. Maybe unnecessary. */ } return NOTIFY_DONE; } diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 027925455f62..3e00ef1777b0 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -1989,7 +1989,7 @@ static int __register_serial(struct serial_struct *req, int line) * port exists and is in use an error is returned. If the port * is not currently in the table it is added. * - * The port is then probed and if neccessary the IRQ is autodetected + * The port is then probed and if necessary the IRQ is autodetected * If this fails an error is returned. * * On success the port is ready to use and the line number is returned. diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 1a7057ae1ac4..69abd70e79cf 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c @@ -159,7 +159,7 @@ static int kobil_startup (struct usb_serial *serial) } usb_set_serial_port_data(serial->port, priv); - // search for the neccessary endpoints + // search for the necessary endpoints pdev = serial->dev; actconfig = pdev->actconfig; interface = actconfig->interface; diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c index 12d163c85d2e..37c3b0f45196 100644 --- a/fs/reiserfs/lbalance.c +++ b/fs/reiserfs/lbalance.c @@ -1192,7 +1192,7 @@ void leaf_paste_entries ( } - /* change item key if neccessary (when we paste before 0-th entry */ + /* change item key if necessary (when we paste before 0-th entry */ if (!before) { set_le_ih_k_offset (ih, deh_offset(new_dehs)); diff --git a/include/asm-arm/arch-sa1100/simpad.h b/include/asm-arm/arch-sa1100/simpad.h index 4f9e10343b30..1527250bd0eb 100644 --- a/include/asm-arm/arch-sa1100/simpad.h +++ b/include/asm-arm/arch-sa1100/simpad.h @@ -46,7 +46,7 @@ #define IRQ_GPIO_CF_IRQ IRQ_GPIO1 #define IRQ_GPIO_CF_CD IRQ_GPIO24 -// CS3 Latch is write only, a shadow is neccessary +// CS3 Latch is write only, a shadow is necessary #define CS3BUSTYPE unsigned volatile long #define CS3_BASE 0xf1000000 diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index 6c09c4f01e07..f6c1eaf22a2c 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h @@ -164,7 +164,7 @@ static inline void *__va(unsigned long x) * NOTE: virtual isn't really correct, actually it should be the offset into the * memory node, but we have no highmem, so that works for now. * TODO: implement (fast) pfn<->pgdat_idx conversion functions, this makes lots - * of the shifts unneccessary. + * of the shifts unnecessary. */ #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h index dc52bf8a7acb..fc16a65a356b 100644 --- a/include/asm-s390/types.h +++ b/include/asm-s390/types.h @@ -32,7 +32,7 @@ typedef __signed__ long long __s64; typedef unsigned long long __u64; #endif /* A address type so that arithmetic can be done on it & it can be upgraded to - 64 bit when neccessary + 64 bit when necessary */ typedef __u32 addr_t; typedef __s32 saddr_t; diff --git a/include/asm-s390x/types.h b/include/asm-s390x/types.h index 2ee9dcb2260b..1163af6aec8d 100644 --- a/include/asm-s390x/types.h +++ b/include/asm-s390x/types.h @@ -32,7 +32,7 @@ typedef unsigned long __u64; /* * A address type so that arithmetic can be done on it & it can be upgraded to - * 64 bit when neccessary + * 64 bit when necessary */ typedef unsigned long addr_t; diff --git a/kernel/cpufreq.c b/kernel/cpufreq.c index 5a1118709aed..17d2845accfd 100644 --- a/kernel/cpufreq.c +++ b/kernel/cpufreq.c @@ -1078,11 +1078,11 @@ int cpufreq_set_policy(struct cpufreq_policy *policy) down(&cpufreq_notifier_sem); - /* adjust if neccessary - all reasons */ + /* adjust if necessary - all reasons */ notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_ADJUST, policy); - /* adjust if neccessary - hardware incompatibility*/ + /* adjust if necessary - hardware incompatibility*/ notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_INCOMPATIBLE, policy); diff --git a/kernel/suspend.c b/kernel/suspend.c index 5bcf2e90b48a..5801413eeb62 100644 --- a/kernel/suspend.c +++ b/kernel/suspend.c @@ -961,7 +961,7 @@ static int relocate_pagedir(void) printk("Relocating pagedir"); if(!does_collide_order(old_pagedir, (unsigned long)old_pagedir, pagedir_order)) { - printk("not neccessary\n"); + printk("not necessary\n"); return 0; } diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c index 9a5ff69d5f7e..4207bc101ed4 100644 --- a/net/ipv4/netfilter/ip_conntrack_ftp.c +++ b/net/ipv4/netfilter/ip_conntrack_ftp.c @@ -321,7 +321,7 @@ static int help(const struct iphdr *iph, size_t len, if (found == -1) { /* We don't usually drop packets. After all, this is connection tracking, not packet filtering. - However, it is neccessary for accurate tracking in + However, it is necessary for accurate tracking in this case. */ if (net_ratelimit()) printk("conntrack_ftp: partial %s %u+%u\n", diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c index 98adfbf6eaf9..995bb4b4412e 100644 --- a/net/ipv4/netfilter/ip_conntrack_irc.c +++ b/net/ipv4/netfilter/ip_conntrack_irc.c @@ -199,7 +199,7 @@ static int help(const struct iphdr *iph, size_t len, LOCK_BH(&ip_irc_lock); /* save position of address in dcc string, - * neccessary for NAT */ + * necessary for NAT */ DEBUGP("tcph->seq = %u\n", tcph->seq); exp->seq = ntohl(tcph->seq) + (addr_beg_p - _data); exp_irc_info->len = (addr_end_p - addr_beg_p); diff --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c index 377a50121229..9028334c5112 100644 --- a/net/ipv4/netfilter/ip_nat_core.c +++ b/net/ipv4/netfilter/ip_nat_core.c @@ -288,7 +288,7 @@ find_best_ips_proto(struct ip_conntrack_tuple *tuple, saved_ip = tuple->src.ip; other_ipp = &tuple->src.ip; } - /* Don't do do_extra_mangle unless neccessary (overrides + /* Don't do do_extra_mangle unless necessary (overrides explicit socket bindings, for example) */ orig_dstip = tuple->dst.ip; diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index a99047e1792d..30f946968ba1 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -623,7 +623,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff) if (new_mode == cl->cmode) return; - if (cl->prio_activity) { /* not neccessary: speed optimization */ + if (cl->prio_activity) { /* not necessary: speed optimization */ if (cl->cmode != HTB_CANT_SEND) htb_deactivate_prios(q,cl); cl->cmode = new_mode; |
