Linux 2.6.20.14
Subsystems (26)
We (the -stable team) are announcing the release of the 2.6.20.14 kernel. This has a variety of important fixes, see below for the summary. This is likely to be the last one in the 2.6.20-stable stream.
I'll also be replying to this message with a copy of the patch between 2.6.20.13 and 2.6.20.14
The updated 2.6.20.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.20.y.git;a=summarythanks,
-chris
---------
Makefile | 2 arch/arm/mach-iop13xx/pci.c | 8 - arch/sparc64/kernel/head.S | 29 +++- arch/sparc64/kernel/itlb_miss.S | 4 arch/sparc64/kernel/pci_sun4v.c | 36 +---- arch/sparc64/mm/init.c | 7 arch/x86_64/mm/pageattr.c | 2 crypto/api.c | 4 drivers/acpi/thermal.c | 3 drivers/ata/sata_via.c | 8 + drivers/base/core.c | 7 drivers/input/serio/i8042.c | 35 ++++ drivers/media/dvb/ttpci/budget-ci.c | 2 drivers/net/smc911x.c | 2 drivers/serial/suncore.c | 6 fs/fuse/dir.c | 2 fs/jfs/jfs_logmgr.c | 3 fs/ntfs/inode.c | 2 include/asm-arm/arch-iop13xx/iop13xx.h | 22 +-- include/asm-s390/checksum.h | 59 ++------ include/asm-sparc64/tsb.h | 2 include/linux/mii.h | 4 include/linux/netfilter/nf_conntrack_proto_gre.h | 18 -- include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h | 19 -- include/net/af_unix.h | 8 - mm/oom_kill.c | 2 mm/rmap.c | 4 net/core/dev.c | 10 - net/core/net-sysfs.c | 8 - net/core/sock.c | 14 + net/core/utils.c | 6 net/ipv4/Kconfig | 6 net/ipv4/icmp.c | 12 + net/ipv4/inet_connection_sock.c | 4 net/ipv4/netfilter/ip_nat_proto_gre.c | 20 +- net/ipv4/netfilter/nf_nat_proto_gre.c | 20 +- net/ipv4/tcp.c | 3 net/ipv4/xfrm4_input.c | 6 net/ipv4/xfrm4_mode_tunnel.c | 2 net/ipv6/addrconf.c | 6 net/ipv6/ip6_fib.c | 8 - net/ipv6/proc.c | 1 net/ipv6/xfrm6_input.c | 6 net/ipv6/xfrm6_mode_tunnel.c | 1 net/unix/af_unix.c | 127 +++++++++++------- scripts/basic/fixdep.c | 2 sound/usb/usbquirks.h | 23 +++ 47 files changed, 315 insertions(+), 270 deletions(-)
Summary of changes from v2.6.20.13 to v2.6.20.14
================================================
Andi Kleen (1):
x86-64: Always flush all pages in change_page_attr
Andrew Morton (2):
acpi-thermal: fix mod_timer() interval ntfs_init_locked_inode(): fix array indexing
Andy Green (1):
kbuild: fixdep segfault on pathological string-o-death
Chris Wright (1):
Linux 2.6.20.14
Dan Williams (1):
iop13xx: fix i/o address translation
Daniel Drake (1):
ALSA: usb-audio: explicitly match Logitech QuickCam
Dave Jones (1):
IPV4: Correct rp_filter help text.
Dave Kleikamp (1):
JFS: Fix race waking up jfsIO kernel thread
David Miller (6):
ICMP: Fix icmp_errors_use_inbound_ifaddr sysctl
NET: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h
SPARC64: Fix two bugs wrt. kernel 4MB TSB.
SPARC64: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler. Fix AF_UNIX OOPS
SPARC64: Don't be picky about virtual-dma values on sun4v.
David Rientjes (1):
oom: kill all threads that share mm with killed task
Heiko Carstens (1):
s390: Fix TCP/UDP pseudo header checksum computation.
Herbert Xu (1):
CRYPTO: api: Read module pointer before freeing algorithm
Jan Engelhardt (1):
SPARC: Linux always started with 9600 8N1
Jerome Borsboom (1):
NET: parse ip:port strings correctly in in4_pton
Jorge Boncompte (1):
{ip, nf}_nat_proto_gre: do not modify/corrupt GREv0 packets through NAT
Kazunori MIYAZAWA (1):
IPSEC: Fix panic when using inter address familiy IPsec on loopback.
Mark Glines (1):
TCP: Use default 32768-61000 outgoing port range in all cases.
Martin Schwidefsky (1):
s390: page_mkclean data corruption.
Miklos Szeredi (1):
fuse: fix mknod of regular file
Oliver Endriss (1):
V4L/DVB (5593): Budget-ci: Fix tuning for TDM 1316 (160..200 MHz)
Roland Scheidegger (1):
Input: i8042 - fix AUX port detection with some chips
Stephen Hemminger (2):
pv6: track device renames in snmp6
NET: Fix race condition about network device name allocation.
Tejun Heo (2):
sata_via: add missing PM hooks
driver-core: don't free devt_attr till the device is released
Vasily Averin (1):
NET: "wrong timeout value" in sk_wait_data() v2
Vitaly Wool (1):
smc911x: fix compilation breakage wjen debug is on
YOSHIFUJI Hideaki (1):
IPV6 ROUTE: No longer handle ::/0 specially.
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 20 -EXTRAVERSION = .13 +EXTRAVERSION = .14 NAME = Homicidal Dwarf Hamster # *DOCUMENTATION*
arch/arm/mach-iop13xx/pci.c +4 -4
@@ -1023,7 +1023,7 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) << IOP13XX_ATUX_PCIXSR_FUNC_NUM;__raw_writel (pcixsr,IOP13XX_ATUX_PCIXSR ); - res[0 ].start =IOP13XX_PCIX_LOWER_IO_PA ; + res[0 ].start =IOP13XX_PCIX_LOWER_IO_PA +IOP13XX_PCIX_IO_BUS_OFFSET ; res[0 ].end =IOP13XX_PCIX_UPPER_IO_PA ; res[0 ].name ="IQ81340 ATUX PCI I/O Space" ; res[0 ].flags =IORESOURCE_IO ;
@@ -1033,7 +1033,7 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) res[1 ].name ="IQ81340 ATUX PCI Memory Space" ; res[1 ].flags =IORESOURCE_MEM ; sys->mem_offset =IOP13XX_PCIX_MEM_OFFSET ; - sys->io_offset =IOP13XX_PCIX_IO_OFFSET ; + sys->io_offset =IOP13XX_PCIX_LOWER_IO_PA ;break ;case IOP13XX_INIT_ATU_ATUE :/* Note: the function number field in the PCSR is ro */
@@ -1044,7 +1044,7 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys)__raw_writel (pcsr,IOP13XX_ATUE_PCSR ); - res[0 ].start =IOP13XX_PCIE_LOWER_IO_PA ; + res[0 ].start =IOP13XX_PCIE_LOWER_IO_PA +IOP13XX_PCIE_IO_BUS_OFFSET ; res[0 ].end =IOP13XX_PCIE_UPPER_IO_PA ; res[0 ].name ="IQ81340 ATUE PCI I/O Space" ; res[0 ].flags =IORESOURCE_IO ;
@@ -1054,7 +1054,7 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) res[1 ].name ="IQ81340 ATUE PCI Memory Space" ; res[1 ].flags =IORESOURCE_MEM ; sys->mem_offset =IOP13XX_PCIE_MEM_OFFSET ; - sys->io_offset =IOP13XX_PCIE_IO_OFFSET ; + sys->io_offset =IOP13XX_PCIE_LOWER_IO_PA ; sys->map_irq = iop13xx_pcie_map_irq;break ;default :
arch/sparc64/kernel/head.S +25 -4
@@ -653,33 +653,54 @@ setup_tba: restore sparc64_boot_end: -#include "ktlb.S" -#include "tsb.S" #include "etrap.S" #include "rtrap.S" #include "winfixup.S" #include "entry.S" #include "sun4v_tlb_miss.S" #include "sun4v_ivec.S" +#include "ktlb.S" +#include "tsb.S" /* * The following skip makes sure the trap table in ttable.S is aligned * on a 32K boundary as required by the v9 specs for TBA register. * * We align to a 32K boundary, then we have the 32K kernel TSB, - * then the 32K aligned trap table. + * the 64K kernel 4MB TSB, and then the 32K aligned trap table. */ 1: .skip 0x4000 + _start - 1b +! 0x0000000000408000 + .globl swapper_tsb swapper_tsb: .skip (32 * 1024) -! 0x0000000000408000 + .globl swapper_4m_tsb +swapper_4m_tsb: + .skip (64 * 1024) + +! 0x0000000000420000 + /* Some care needs to be exercised if you try to move the + * location of the trap table relative to other things. For + * one thing there are br* instructions in some of the + * trap table entires which branch back to code in ktlb.S + * Those instructions can only handle a signed 16-bit + * displacement. + * + * There is a binutils bug (bugzilla #4558) which causes + * the relocation overflow checks for such instructions to + * not be done correctly. So bintuils will not notice the + * error and will instead write junk into the relocation and + * you'll have an unbootable kernel. + */ #include "ttable.S" +! 0x0000000000428000 + #include "systbls.S" .data
arch/sparc64/kernel/itlb_miss.S +2 -2
@@ -11,12 +11,12 @@ /* ITLB ** ICACHE line 2: TSB compare and TLB load */ bne,pn %xcc, tsb_miss_itlb ! Miss mov FAULT_CODE_ITLB, %g3 - andcc %g5, _PAGE_EXEC_4U, %g0 ! Executable? + sethi %hi(_PAGE_EXEC_4U), %g4 + andcc %g5, %g4, %g0 ! Executable? be,pn %xcc, tsb_do_fault nop ! Delay slot, fill me stxa %g5, [%g0] ASI_ITLB_DATA_IN ! Load TLB retry ! Trap done - nop /* ITLB ** ICACHE line 3: */ nop
arch/sparc64/kernel/pci_sun4v.c +10 -26
@@ -10,6 +10,7 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/percpu.h> +#include <linux/log2.h> #include <asm/pbm.h> #include <asm/iommu.h>
@@ -994,9 +995,8 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) {struct pci_iommu *iommu = pbm->iommu;struct property *prop; -unsigned long num_tsb_entries, sz; +unsigned long num_tsb_entries, sz, tsbsize;u32 vdma[2 ], dma_mask, dma_offset; -int tsbsize; prop =of_find_property (pbm->prom_node,"virtual-dma" ,NULL );if (prop) {
@@ -1010,31 +1010,15 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) vdma[1 ] =0x80000000 ; } - dma_mask = vdma[0 ]; -switch (vdma[1 ]) { -case 0x20000000 : - dma_mask |=0x1fffffff ; - tsbsize =64 ; -break ; - -case 0x40000000 : - dma_mask |=0x3fffffff ; - tsbsize =128 ; -break ; - -case 0x80000000 : - dma_mask |=0x7fffffff ; - tsbsize =256 ; -break ; - -default : -prom_printf ("PCI-SUN4V: strange virtual-dma size.\n" ); -prom_halt (); +if ((vdma[0 ] | vdma[1 ]) & ~IO_PAGE_MASK ) { +prom_printf ("PCI-SUN4V: strange virtual-dma[%08x:%08x].\n" , + vdma[0 ], vdma[1 ]); +prom_halt (); }; - tsbsize *= (8 *1024 ); - - num_tsb_entries = tsbsize /sizeof (iopte_t); + dma_mask = (roundup_pow_of_two (vdma[1 ]) -1UL ); + num_tsb_entries = vdma[1 ] /IO_PAGE_SIZE ; + tsbsize = num_tsb_entries *sizeof (iopte_t); dma_offset = vdma[0 ];
@@ -1045,7 +1029,7 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) iommu->dma_addr_mask = dma_mask;/* Allocate and initialize the free area map. */ - sz = num_tsb_entries /8 ; + sz = (num_tsb_entries +7 ) /8 ; sz = (sz +7UL ) & ~7UL ; iommu->arena.map =kzalloc (sz,GFP_KERNEL );if (!iommu->arena.map) {
arch/sparc64/mm/init.c +5 -2
@@ -60,8 +60,11 @@ unsigned long kern_linear_pte_xor[2] __read_mostly;unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES /sizeof (unsigned long )];#ifndef CONFIG_DEBUG_PAGEALLOC -/* A special kernel TSB for 4MB and 256MB linear mappings. */ -struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES ]; +/* A special kernel TSB for 4MB and 256MB linear mappings. +* Space is allocated for this right after the trap table +* in arch/sparc64/kernel/head.S +*/ +extern struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES ];#endif #define MAX_BANKS 32
arch/x86_64/mm/pageattr.c +1 -1
@@ -81,8 +81,8 @@ static void flush_kernel_map(void *arg)void *adr =page_address (pg);if (cpu_has_clflush)cache_flush_page (adr); -__flush_tlb_one (adr); } +__flush_tlb_all (); }static inline void flush_map (struct list_head *l)
crypto/api.c +3 -1
@@ -48,8 +48,10 @@ EXPORT_SYMBOL_GPL(crypto_mod_get);void crypto_mod_put (struct crypto_alg *alg) { +struct module *module = alg->cra_module; +crypto_alg_put (alg); -module_put (alg->cra_module); +module_put (module); }EXPORT_SYMBOL_GPL (crypto_mod_put);
drivers/acpi/thermal.c +2 -1
@@ -758,7 +758,8 @@ static void acpi_thermal_check(void *data)del_timer (&(tz->timer)); }else {if (timer_pending (&(tz->timer))) -mod_timer (&(tz->timer), (HZ * sleep_time) /1000 ); +mod_timer (&(tz->timer), + jiffies + (HZ * sleep_time) /1000 );else { tz->timer.data = (unsigned long )tz; tz->timer.function = acpi_thermal_run;
drivers/ata/sata_via.c +8 -0
@@ -90,6 +90,10 @@ static struct pci_driver svia_pci_driver = { .name = DRV_NAME, .id_table = svia_pci_tbl, .probe = svia_init_one, +#ifdef CONFIG_PM + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, +#endif .remove = ata_pci_remove_one, };
@@ -109,6 +113,10 @@ static struct scsi_host_template svia_sht = { .slave_configure = ata_scsi_slave_config, .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, +#ifdef CONFIG_PM + .suspend = ata_scsi_device_suspend, + .resume = ata_scsi_device_resume, +#endif }; static const struct ata_port_operations vt6420_sata_ops = {
drivers/base/core.c +4 -3
@@ -93,6 +93,9 @@ static void device_release(struct kobject * kobj) {struct device * dev =to_dev (kobj); +kfree (dev->devt_attr); + dev->devt_attr =NULL ; +if (dev->release) dev->release (dev);else if (dev->class && dev->class->dev_release)
@@ -650,10 +653,8 @@ void device_del(struct device * dev)if (parent)klist_del (&dev->knode_parent); -if (dev->devt_attr) { +if (dev->devt_attr)device_remove_file (dev, dev->devt_attr); -kfree (dev->devt_attr); - }if (dev->class) {sysfs_remove_link (&dev->kobj,"subsystem" );/* If this is not a "fake" compatible device, remove the
drivers/input/serio/i8042.c +29 -6
@@ -533,6 +533,33 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)return IRQ_HANDLED ; } +/* +* i8042_toggle_aux - enables or disables AUX port on i8042 via command and +* verifies success by readinng CTR. Used when testing for presence of AUX +* port. +*/ +static int __devinit i8042_toggle_aux (int on) +{ +unsigned char param; +int i; + +if (i8042_command (¶m, + on ?I8042_CMD_AUX_ENABLE :I8042_CMD_AUX_DISABLE )) +return -1 ; + +/* some chips need some time to set the I8042_CTR_AUXDIS bit */ +for (i =0 ; i <100 ; i++) { +udelay (50 ); + +if (i8042_command (¶m,I8042_CMD_CTL_RCTR )) +return -1 ; + +if (!(param &I8042_CTR_AUXDIS ) == on) +return 0 ; + } + +return -1 ; +}/* * i8042_check_aux() applies as much paranoia as it can at detecting
@@ -587,16 +614,12 @@ static int __devinit i8042_check_aux(void)* Bit assignment test - filters out PS/2 i8042's in AT mode */ -if (i8042_command (¶m,I8042_CMD_AUX_DISABLE )) -return -1 ; -if (i8042_command (¶m,I8042_CMD_CTL_RCTR ) || (~param &I8042_CTR_AUXDIS )) { +if (i8042_toggle_aux (0 )) {printk (KERN_WARNING "Failed to disable AUX port, but continuing anyway... Is this a SiS?\n" );printk (KERN_WARNING "If AUX port is really absent please use the 'i8042.noaux' option.\n" ); } -if (i8042_command (¶m,I8042_CMD_AUX_ENABLE )) -return -1 ; -if (i8042_command (¶m,I8042_CMD_CTL_RCTR ) || (param &I8042_CTR_AUXDIS )) +if (i8042_toggle_aux (1 ))return -1 ;/*
drivers/media/dvb/ttpci/budget-ci.c +1 -1
@@ -892,7 +892,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc band =1 ; }else if (tuner_frequency <200000000 ) { cp =6 ; - band =2 ; + band =1 ; }else if (tuner_frequency <290000000 ) { cp =3 ; band =2 ;
drivers/net/smc911x.c +1 -1
@@ -499,7 +499,7 @@ static inline void smc911x_rcv(struct net_device *dev)SMC_SET_RX_CFG (RX_CFG_RX_END_ALGN4_ | ((2 <<8 ) &RX_CFG_RXDOFF_ ));SMC_PULL_DATA (data, pkt_len+2 +3 ); - DBG(SMC_DEBUG_PKTS, "%s: Received packet\n", dev->name,); +DBG (SMC_DEBUG_PKTS ,"%s: Received packet\n" , dev->name);PRINT_PKT (data, ((pkt_len -4 ) <=64 ) ? pkt_len -4 :64 ); dev->last_rx = jiffies; skb->dev = dev;
drivers/serial/suncore.c +3 -3
@@ -30,9 +30,9 @@ void sunserial_console_termios(struct console *con) {char mode[16 ], buf[16 ], *s; -char *mode_prop ="ttyX-mode" ; -char *cd_prop ="ttyX-ignore-cd" ; -char *dtr_prop ="ttyX-rts-dtr-off" ; +char mode_prop[] ="ttyX-mode" ; +char cd_prop[] ="ttyX-ignore-cd" ; +char dtr_prop[] ="ttyX-rts-dtr-off" ;char *ssp_console_modes_prop ="ssp-console-modes" ;int baud, bits, stop, cflag;char parity;
fs/fuse/dir.c +1 -1
@@ -484,7 +484,7 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode,static int fuse_create (struct inode *dir,struct dentry *entry,int mode,struct nameidata *nd) { -if (nd && (nd->flags &LOOKUP_CREATE )) { +if (nd && (nd->flags &LOOKUP_OPEN )) {int err =fuse_create_open (dir, entry, mode, nd);if (err != -ENOSYS )return err;
fs/jfs/jfs_logmgr.c +2 -1
@@ -2354,12 +2354,13 @@ int jfsIOWait(void *arg)lbmStartIO (bp);spin_lock_irq (&log_redrive_lock); } -spin_unlock_irq (&log_redrive_lock);if (freezing (current)) { +spin_unlock_irq (&log_redrive_lock);refrigerator (); }else {set_current_state (TASK_INTERRUPTIBLE ); +spin_unlock_irq (&log_redrive_lock);schedule (); current->state =TASK_RUNNING ; }
fs/ntfs/inode.c +1 -1
@@ -141,7 +141,7 @@ static int ntfs_init_locked_inode(struct inode *vi, ntfs_attr *na)if (!ni->name)return -ENOMEM ;memcpy (ni->name, na->name, i); - ni->name[i] =0 ; + ni->name[na->name_len] =0 ; }return 0 ; }
include/asm-arm/arch-iop13xx/iop13xx.h +13 -9
@@ -55,19 +55,24 @@ static inline int iop13xx_cpu_id(void)#define IOP13XX_PCI_OFFSET IOP13XX_MAX_RAM_SIZE/* PCI MAP -* 0x0000.0000 - 0x8000.0000 1:1 mapping with Physical RAM -* 0x8000.0000 - 0x8800.0000 PCIX/PCIE memory window (128MB) -*/ +* bus range cpu phys cpu virt note +* 0x0000.0000 + 2GB (n/a) (n/a) inbound, 1:1 mapping with Physical RAM +* 0x8000.0000 + 928M 0x1.8000.0000 (ioremap) PCIX outbound memory window +* 0x8000.0000 + 928M 0x2.8000.0000 (ioremap) PCIE outbound memory window +* +* IO MAP +* 0x1000 + 64K 0x0.fffb.1000 0xfec6.1000 PCIX outbound i/o window +* 0x1000 + 64K 0x0.fffd.1000 0xfed7.1000 PCIE outbound i/o window +*/ #define IOP13XX_PCIX_IO_WINDOW_SIZE 0x10000UL#define IOP13XX_PCIX_LOWER_IO_PA 0xfffb0000UL#define IOP13XX_PCIX_LOWER_IO_VA 0xfec60000UL -#define IOP13XX_PCIX_LOWER_IO_BA 0x0fff0000UL +#define IOP13XX_PCIX_LOWER_IO_BA 0x0UL/* OIOTVR */ +#define IOP13XX_PCIX_IO_BUS_OFFSET 0x1000UL#define IOP13XX_PCIX_UPPER_IO_PA (IOP13XX_PCIX_LOWER_IO_PA +\ IOP13XX_PCIX_IO_WINDOW_SIZE - 1)#define IOP13XX_PCIX_UPPER_IO_VA (IOP13XX_PCIX_LOWER_IO_VA +\ IOP13XX_PCIX_IO_WINDOW_SIZE - 1) -#define IOP13XX_PCIX_IO_OFFSET (IOP13XX_PCIX_LOWER_IO_VA -\ - IOP13XX_PCIX_LOWER_IO_BA)#define IOP13XX_PCIX_IO_PHYS_TO_VIRT (addr) (u32) ((u32) addr -\ (IOP13XX_PCIX_LOWER_IO_PA\ - IOP13XX_PCIX_LOWER_IO_VA))
@@ -93,15 +98,14 @@ static inline int iop13xx_cpu_id(void)#define IOP13XX_PCIE_IO_WINDOW_SIZE 0x10000UL#define IOP13XX_PCIE_LOWER_IO_PA 0xfffd0000UL#define IOP13XX_PCIE_LOWER_IO_VA 0xfed70000UL -#define IOP13XX_PCIE_LOWER_IO_BA 0x0fff0000UL +#define IOP13XX_PCIE_LOWER_IO_BA 0x0UL/* OIOTVR */ +#define IOP13XX_PCIE_IO_BUS_OFFSET 0x1000UL#define IOP13XX_PCIE_UPPER_IO_PA (IOP13XX_PCIE_LOWER_IO_PA +\ IOP13XX_PCIE_IO_WINDOW_SIZE - 1)#define IOP13XX_PCIE_UPPER_IO_VA (IOP13XX_PCIE_LOWER_IO_VA +\ IOP13XX_PCIE_IO_WINDOW_SIZE - 1)#define IOP13XX_PCIE_UPPER_IO_BA (IOP13XX_PCIE_LOWER_IO_BA +\ IOP13XX_PCIE_IO_WINDOW_SIZE - 1) -#define IOP13XX_PCIE_IO_OFFSET (IOP13XX_PCIE_LOWER_IO_VA -\ - IOP13XX_PCIE_LOWER_IO_BA)#define IOP13XX_PCIE_IO_PHYS_TO_VIRT (addr) (u32) ((u32) addr -\ (IOP13XX_PCIE_LOWER_IO_PA\ - IOP13XX_PCIE_LOWER_IO_VA))
include/asm-s390/checksum.h +15 -44
65 lines not on this page · raw message
include/asm-sparc64/tsb.h +1 -1
@@ -271,7 +271,7 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;#define KERN_TSB4M_LOOKUP_TL1 (TAG ,REG1 ,REG2 ,REG3 ,REG4 ,OK_LABEL ) \ sethi %hi(swapper_4m_tsb), REG1; \ or REG1, %lo(swapper_4m_tsb), REG1; \ - and TAG, (KERNEL_TSB_NENTRIES - 1), REG2; \ + and TAG, (KERNEL_TSB4M_NENTRIES - 1), REG2; \ sllx REG2, 4, REG2; \ add REG1, REG2, REG2; \ KTSB_LOAD_QUAD(REG2, REG3); \
include/linux/mii.h +2 -2
@@ -56,8 +56,8 @@#define BMSR_ANEGCOMPLETE 0x0020/* Auto-negotiation complete */ #define BMSR_RESV 0x00c0/* Unused... */ #define BMSR_ESTATEN 0x0100/* Extended Status in R15 */ -#define BMSR_100FULL2 0x0200/* Can do 100BASE-T2 HDX */ -#define BMSR_100HALF2 0x0400/* Can do 100BASE-T2 FDX */ +#define BMSR_100HALF2 0x0200/* Can do 100BASE-T2 HDX */ +#define BMSR_100FULL2 0x0400/* Can do 100BASE-T2 FDX */ #define BMSR_10HALF 0x0800/* Can do 10mbps, half-duplex */ #define BMSR_10FULL 0x1000/* Can do 10mbps, full-duplex */ #define BMSR_100HALF 0x2000/* Can do 100mbps, half-duplex */
include/linux/netfilter/nf_conntrack_proto_gre.h +0 -18
@@ -87,24 +87,6 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,/* delete keymap entries */ void nf_ct_gre_keymap_destroy (struct nf_conn *ct); -/* get pointer to gre key, if present */ -static inline __be32 *gre_key (struct gre_hdr *greh) -{ -if (!greh->key) -return NULL ; -if (greh->csum || greh->routing) -return (__be32 *)(greh+sizeof (*greh)+4 ); -return (__be32 *)(greh+sizeof (*greh)); -} - -/* get pointer ot gre csum, if present */ -static inline __sum16 *gre_csum (struct gre_hdr *greh) -{ -if (!greh->csum) -return NULL ; -return (__sum16 *)(greh+sizeof (*greh)); -} -extern void nf_ct_gre_keymap_flush (void );extern void nf_nat_need_gre (void );
include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h +0 -19
@@ -90,25 +90,6 @@ int ip_ct_gre_keymap_add(struct ip_conntrack *ct,/* delete keymap entries */ void ip_ct_gre_keymap_destroy (struct ip_conntrack *ct); - -/* get pointer to gre key, if present */ -static inline __be32 *gre_key (struct gre_hdr *greh) -{ -if (!greh->key) -return NULL ; -if (greh->csum || greh->routing) -return (__be32 *) (greh+sizeof (*greh)+4 ); -return (__be32 *) (greh+sizeof (*greh)); -} - -/* get pointer ot gre csum, if present */ -static inline __sum16 *gre_csum (struct gre_hdr *greh) -{ -if (!greh->csum) -return NULL ; -return (__sum16 *) (greh+sizeof (*greh)); -} -#endif /* __KERNEL__ */ #endif /* _CONNTRACK_PROTO_GRE_H */
include/net/af_unix.h +3 -5
@@ -62,13 +62,11 @@ struct unix_skb_parms {#define UNIXCREDS (skb) (&UNIXCB((skb)).creds)#define UNIXSID (skb) (&UNIXCB((skb)).secid) -#define unix_state_rlock (s) spin_lock(&unix_sk(s)->lock) -#define unix_state_runlock (s) spin_unlock(&unix_sk(s)->lock) -#define unix_state_wlock (s) spin_lock(&unix_sk(s)->lock) -#define unix_state_wlock_nested (s) \ +#define unix_state_lock (s) spin_lock(&unix_sk(s)->lock) +#define unix_state_unlock (s) spin_unlock(&unix_sk(s)->lock) +#define unix_state_lock_nested (s) \ spin_lock_nested(&unix_sk(s)->lock, \ SINGLE_DEPTH_NESTING) -#define unix_state_wunlock (s) spin_unlock(&unix_sk(s)->lock)#ifdef __KERNEL__/* The AF_UNIX socket */
mm/oom_kill.c +1 -1
@@ -335,7 +335,7 @@ static int oom_kill_task(struct task_struct *p)*/ do_each_thread(g, q) {if (q->mm == mm && q->tgid != p->tgid) -force_sig (SIGKILL , p); +force_sig (SIGKILL , q); }while_each_thread (g, q);return 0 ;
mm/rmap.c +2 -2
@@ -490,9 +490,9 @@ int page_mkclean(struct page *page)struct address_space *mapping =page_mapping (page);if (mapping) ret =page_mkclean_file (mapping, page); +if (page_test_and_clear_dirty (page)) + ret =1 ; } -if (page_test_and_clear_dirty (page)) - ret =1 ;return ret; }
net/core/dev.c +6 -4
@@ -3138,7 +3138,6 @@ void netdev_run_todo(void)continue ; } -netdev_unregister_sysfs (dev); dev->reg_state =NETREG_UNREGISTERED ;netdev_wait_allrefs (dev);
@@ -3149,11 +3148,11 @@ void netdev_run_todo(void)BUG_TRAP (!dev->ip6_ptr);BUG_TRAP (!dev->dn_ptr); -/* It must be the very last action, -* after this 'dev' may point to freed up memory. -*/ if (dev->destructor) dev->destructor (dev); + +/* Free network device */ +kobject_put (&dev->class_dev.kobj); } out:
@@ -3310,6 +3309,9 @@ int unregister_netdevice(struct net_device *dev)/* Notifier chain MUST detach us from master device. */ BUG_TRAP (!dev->master); +/* Remove entries from sysfs */ +netdev_unregister_sysfs (dev); +/* Finish processing unregister after unlock */ net_set_todo (dev);
net/core/net-sysfs.c +7 -1
@@ -440,9 +440,15 @@ static struct class net_class = {#endif }; +/* Delete sysfs entries but hold kobject reference until after all +* netdev references are gone. +*/ void netdev_unregister_sysfs (struct net_device * net) { -class_device_del (&(net->class_dev)); +struct class_device *dev = &(net->class_dev); + +kobject_get (&dev->kobj); +class_device_del (dev); }/* Create sysfs entries for network device. */
net/core/sock.c +13 -1
@@ -204,7 +204,19 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)return -EINVAL ;if (copy_from_user (&tv, optval,sizeof (tv)))return -EFAULT ; - +if (tv.tv_usec <0 || tv.tv_usec >=USEC_PER_SEC ) +return -EDOM ; + +if (tv.tv_sec <0 ) { +static int warned =0 ; + *timeo_p =0 ; +if (warned <10 &&net_ratelimit ()) + warned++; +printk (KERN_INFO "sock_set_timeout: `%s' (pid %d) " +"tries to set negative timeout\n" , + current->comm, current->pid); +return 0 ; + } *timeo_p =MAX_SCHEDULE_TIMEOUT ;if (tv.tv_sec ==0 && tv.tv_usec ==0 )return 0 ;
net/core/utils.c +3 -3
@@ -137,16 +137,16 @@ int in4_pton(const char *src, int srclen,while (1 ) {int c; c =xdigit2bin (srclen >0 ? *s :'\0' , delim); -if (!(c & (IN6PTON_DIGIT |IN6PTON_DOT |IN6PTON_DELIM ))) { +if (!(c & (IN6PTON_DIGIT |IN6PTON_DOT |IN6PTON_DELIM |IN6PTON_COLON_MASK ))) { goto out; } -if (c & (IN6PTON_DOT |IN6PTON_DELIM )) { +if (c & (IN6PTON_DOT |IN6PTON_DELIM |IN6PTON_COLON_MASK )) {if (w ==0 ) goto out; *d++ = w &0xff ; w =0 ; i++; -if (c &IN6PTON_DELIM ) { +if (c & (IN6PTON_DELIM |IN6PTON_COLON_MASK )) {if (i !=4 ) goto out;break ;
net/ipv4/Kconfig +3 -3
@@ -43,11 +43,11 @@ config IP_ADVANCED_ROUTER asymmetric routing (packets from you to a host take a different path than packets from that host to you) or if you operate a non-routing host which has several IP addresses on different interfaces. To turn - rp_filter off use: + rp_filter on use: - echo 0 > /proc/sys/net/ipv4/conf/<device>/rp_filter + echo 1 > /proc/sys/net/ipv4/conf/<device>/rp_filter or - echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter + echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter If unsure, say N here.
net/ipv4/icmp.c +9 -3
@@ -513,9 +513,15 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) saddr = iph->daddr;if (!(rt->rt_flags &RTCF_LOCAL )) { -if (sysctl_icmp_errors_use_inbound_ifaddr) - saddr =inet_select_addr (skb_in->dev,0 ,RT_SCOPE_LINK ); -else +struct net_device *dev =NULL ; + +if (rt->fl.iif && sysctl_icmp_errors_use_inbound_ifaddr) + dev =dev_get_by_index (rt->fl.iif); + +if (dev) { + saddr =inet_select_addr (dev,0 ,RT_SCOPE_LINK ); +dev_put (dev); + }else saddr =0 ; }
net/ipv4/inet_connection_sock.c +1 -3
@@ -31,10 +31,8 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg);/* * This array holds the first and last local port number. -* For high-usage systems, use sysctl to change this to -* 32768-61000 */ -int sysctl_local_port_range[2 ] = {1024 ,4999 }; +int sysctl_local_port_range[2 ] = {32768 ,61000 };int inet_csk_bind_conflict (const struct sock *sk,const struct inet_bind_bucket *tb)
net/ipv4/netfilter/ip_nat_proto_gre.c +8 -12
@@ -70,6 +70,11 @@ gre_unique_tuple(struct ip_conntrack_tuple *tuple,__be16 *keyptr;unsigned int min, i, range_size; +/* If there is no master conntrack we are not PPTP, +do not change tuples */ +if (!conntrack->master) +return 0 ; +if (maniptype ==IP_NAT_MANIP_SRC ) keyptr = &tuple->src.u.gre.key;else
@@ -122,18 +127,9 @@ gre_manip_pkt(struct sk_buff **pskb,if (maniptype ==IP_NAT_MANIP_DST ) {/* key manipulation is always dest */ switch (greh->version) { -case 0 : -if (!greh->key) { -DEBUGP ("can't nat GRE w/o key\n" ); -break ; - } -if (greh->csum) { -/* FIXME: Never tested this code... */ -nf_proto_csum_replace4 (gre_csum (greh), *pskb, - *(gre_key (greh)), - tuple->dst.u.gre.key,0 ); - } - *(gre_key (greh)) = tuple->dst.u.gre.key; +case GRE_VERSION_1701 : +/* We do not currently NAT any GREv0 packets. +* Try to behave like "ip_nat_proto_unknown" */ break ;case GRE_VERSION_PPTP : DEBUGP("call_id -> 0x%04x\n",
net/ipv4/netfilter/nf_nat_proto_gre.c +8 -12
@@ -72,6 +72,11 @@ gre_unique_tuple(struct nf_conntrack_tuple *tuple,__be16 *keyptr;unsigned int min, i, range_size; +/* If there is no master conntrack we are not PPTP, +do not change tuples */ +if (!conntrack->master) +return 0 ; +if (maniptype ==IP_NAT_MANIP_SRC ) keyptr = &tuple->src.u.gre.key;else
@@ -122,18 +127,9 @@ gre_manip_pkt(struct sk_buff **pskb, unsigned int iphdroff,if (maniptype !=IP_NAT_MANIP_DST )return 1 ;switch (greh->version) { -case 0 : -if (!greh->key) { -DEBUGP ("can't nat GRE w/o key\n" ); -break ; - } -if (greh->csum) { -/* FIXME: Never tested this code... */ -nf_proto_csum_replace4 (gre_csum (greh), *pskb, - *(gre_key (greh)), - tuple->dst.u.gre.key,0 ); - } - *(gre_key (greh)) = tuple->dst.u.gre.key; +case GRE_VERSION_1701 : +/* We do not currently NAT any GREv0 packets. +* Try to behave like "nf_nat_proto_unknown" */ break ;case GRE_VERSION_PPTP :DEBUGP ("call_id -> 0x%04x\n" ,ntohs (tuple->dst.u.gre.key));
net/ipv4/tcp.c +0 -3
@@ -2445,13 +2445,10 @@ void __init tcp_init(void) order++) ;if (order >=4 ) { - sysctl_local_port_range[0 ] =32768 ; - sysctl_local_port_range[1 ] =61000 ; tcp_death_row.sysctl_max_tw_buckets =180000 ; sysctl_tcp_max_orphans =4096 << (order -4 ); sysctl_max_syn_backlog =1024 ; }else if (order <3 ) { - sysctl_local_port_range[0 ] =1024 * (3 - order); tcp_death_row.sysctl_max_tw_buckets >>= (3 - order); sysctl_tcp_max_orphans >>= (3 - order); sysctl_max_syn_backlog =128 ;
net/ipv4/xfrm4_input.c +2 -4
@@ -136,10 +136,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)nf_reset (skb);if (decaps) { -if (!(skb->dev->flags&IFF_LOOPBACK )) { -dst_release (skb->dst); - skb->dst =NULL ; - } +dst_release (skb->dst); + skb->dst =NULL ;netif_rx (skb);return 0 ; }else {
net/ipv4/xfrm4_mode_tunnel.c +2 -0
@@ -66,6 +66,8 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->daddr = x->id.daddr.a4; top_iph->protocol =IPPROTO_IPIP ; + skb->protocol =htons (ETH_P_IP ); +memset (&(IPCB (skb)->opt),0 ,sizeof (struct ip_options ));return 0 ; }
net/ipv6/addrconf.c +4 -2
@@ -2338,8 +2338,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,break ;case NETDEV_CHANGENAME : -#ifdef CONFIG_SYSCTL if (idev) { +snmp6_unregister_dev (idev); +#ifdef CONFIG_SYSCTL addrconf_sysctl_unregister (&idev->cnf);neigh_sysctl_unregister (idev->nd_parms); neigh_sysctl_register(dev, idev->nd_parms,
@@ -2347,8 +2348,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, &ndisc_ifinfo_sysctl_change, NULL);addrconf_sysctl_register (idev, &idev->cnf); - }#endif +snmp6_register_dev (idev); + }break ; };
net/ipv6/ip6_fib.c +0 -8
@@ -620,14 +620,6 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, ins = &fn->leaf; -if (fn->fn_flags&RTN_TL_ROOT && - fn->leaf == &ip6_null_entry && - !(rt->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF )) ){ - fn->leaf = rt; - rt->u.next =NULL ; - goto out; - } -for (iter = fn->leaf; iter; iter=iter->u.next) {/* * Search for duplicates
net/ipv6/proc.c +1 -0
@@ -237,6 +237,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev)return -EINVAL ;remove_proc_entry (idev->stats.proc_dir_entry->name, proc_net_devsnmp6); + idev->stats.proc_dir_entry =NULL ;return 0 ; }
net/ipv6/xfrm6_input.c +2 -4
@@ -103,10 +103,8 @@ int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi)nf_reset (skb);if (decaps) { -if (!(skb->dev->flags&IFF_LOOPBACK )) { -dst_release (skb->dst); - skb->dst =NULL ; - } +dst_release (skb->dst); + skb->dst =NULL ;netif_rx (skb);return -1 ; }else {
net/ipv6/xfrm6_mode_tunnel.c +1 -0
@@ -65,6 +65,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->hop_limit =dst_metric (dst->child,RTAX_HOPLIMIT );ipv6_addr_copy (&top_iph->saddr, (struct in6_addr *)&x->props.saddr);ipv6_addr_copy (&top_iph->daddr, (struct in6_addr *)&x->id.daddr); + skb->protocol =htons (ETH_P_IPV6 );return 0 ; }
net/unix/af_unix.c +80 -47
373 lines not on this page · raw message
scripts/basic/fixdep.c +2 -0
@@ -249,6 +249,8 @@ void parse_config_file(char *map, size_t len) found:if (!memcmp (q -7 ,"_MODULE" ,7 )) q -=7 ; +if ( (q-p-7 ) <0 ) +continue ;use_config (p+7 , q-p-7 ); } }
sound/usb/usbquirks.h +23 -0
@@ -40,6 +40,29 @@ .bInterfaceClass = USB_CLASS_VENDOR_SPEC/* +* Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface +* class matches do not take effect without an explicit ID match. +*/ +{ + .match_flags =USB_DEVICE_ID_MATCH_DEVICE | +USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f0, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass =USB_SUBCLASS_AUDIO_CONTROL +}, +{ + .match_flags =USB_DEVICE_ID_MATCH_DEVICE | +USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f6, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass =USB_SUBCLASS_AUDIO_CONTROL +}, + +/* * Yamaha devices */