Linux 2.6.34.3
Subsystems (29)
I'm announcing the release of the 2.6.34.3 kernel.
All users of the 2.6.34 kernel series should upgrade.
The updated 2.6.34.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.34.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.34.y.git;a=summarythanks,
greg k-h
------------
Documentation/.gitignore | 7 ++ Makefile | 2 arch/arm/plat-mxc/gpio.c | 8 +++ arch/arm/plat-mxc/include/mach/gpio.h | 1 arch/parisc/kernel/firmware.c | 12 ---- arch/x86/.gitignore | 3 + arch/x86/kvm/mmu.c | 2 arch/x86/xen/enlighten.c | 2 arch/x86/xen/time.c | 39 ---------------- drivers/edac/amd64_edac.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 7 ++ drivers/gpu/drm/radeon/r600.c | 24 +++++++++ drivers/gpu/drm/radeon/r600d.h | 1 drivers/gpu/drm/radeon/radeon_atombios.c | 15 ++---- drivers/gpu/drm/radeon/radeon_combios.c | 4 + drivers/gpu/drm/radeon/rs600.c | 1 drivers/gpu/drm/radeon/rs690.c | 2 drivers/gpu/drm/radeon/rv770.c | 5 +- drivers/gpu/drm/radeon/rv770d.h | 1 drivers/misc/enclosure.c | 7 ++ drivers/net/e1000e/hw.h | 2 drivers/net/e1000e/netdev.c | 13 +++-- drivers/net/igb/igb_main.c | 8 +-- drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 drivers/net/wireless/ath/ath9k/hw.c | 19 ++++++- drivers/net/wireless/ath/ath9k/xmit.c | 68 ++++++++++++++-------------- drivers/net/wireless/iwlwifi/iwl-scan.c | 18 +++---- drivers/parisc/led.c | 6 +- drivers/ssb/driver_chipcommon_pmu.c | 17 ++++--- drivers/ssb/pci.c | 20 +------- drivers/staging/comedi/Kconfig | 5 ++ drivers/staging/comedi/drivers/Makefile | 4 + drivers/usb/core/hcd.c | 3 - fs/gfs2/dir.c | 2 fs/nfs/file.c | 13 ++++- fs/nfs/write.c | 7 -- include/drm/drm_pciids.h | 7 ++ include/linux/nfs_fs.h | 7 ++ include/linux/ssb/ssb.h | 5 +- include/linux/ssb/ssb_driver_chipcommon.h | 15 +++++- mm/memory.c | 16 +++++- net/9p/trans_fd.c | 2 net/mac80211/mesh_plink.c | 42 ++++++++++++----- net/wireless/mlme.c | 8 +-- net/wireless/scan.c | 5 ++ 45 files changed, 277 insertions(+), 186 deletions(-)
Alex Deucher (3):
drm/radeon/kms/igp: sideport is AMD only
drm/radeon: add new pci ids
drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush
Baruch Siach (1):
arm/imx/gpio: add spinlock protection
Bob Peterson (1):
GFS2: rename causes kernel Oops
Borislav Petkov (3):
amd64_edac: Fix DCT base address selector
amd64_edac: Correct scrub rate setting
amd64_edac: Fix operator precendence error
Bruce Allan (1):
e1000e: 82577/82578 PHY register access issues
Chris Wilson (1):
drm/i915: Check overlay stride errata for i830 and i845
Christoph Fritz (1):
ssb: fix NULL ptr deref when pcihost_wrapper is used
Dan Carpenter (1):
9p: strlen() doesn't count the terminator
Dean Nelson (1):
e1000e: don't inadvertently re-set INTX_DISABLE
Felix Fietkau (4):
ath9k: fix a potential buffer leak in the STA teardown path
ath9k_hw: fix an off-by-one error in the PDADC boundaries calculation
ath9k: fix TSF after reset on AR913x
ath9k: fix yet another buffer leak in the tx aggregation code
Greg Kroah-Hartman (2):
Revert "ssb: Handle Netbook devices where the SPROM address is changed" Linux 2.6.34.3
Greg Rose (1):
igb: Use only a single Tx queue in SR-IOV mode
Helge Deller (1):
PARISC: led.c - fix potential stack overflow in led_proc_write()
Hugh Dickins (1):
mm: fix ia64 crash when gcore reads gate area
Ian Abbott (1):
comedi: Uncripple 8255-based DIO subdevices
James Bottomley (1):
SCSI: enclosure: fix error path - actually return ERR_PTR() on error
Jan III Sobieski (1):
add random binaries to .gitignore
Jeremy Fitzhardinge (1):
xen: drop xen_sched_clock in favour of using plain wallclock time
Johannes Berg (2):
cfg80211: ignore spurious deauth
cfg80211: don't get expired BSSes
John W. Linville (3):
ath9k: enable serialize_regmode for non-PCIE AR9160
mac80211: avoid scheduling while atomic in mesh_rx_plink_frame
ssb: do not read SPROM if it does not exist
Kyle McMartin (1):
parisc: pass through '\t' to early (iodc) console
Larry Finger (1):
ssb: Handle alternate SSPROM location
Ming Lei (1):
USB: add missing "{}" in map_urb_for_dma
Rafał Miłecki (1):
ssb: Look for SPROM at different offset on higher rev CC
Stanislaw Gruszka (1):
iwlwifi: fix scan abort
Trond Myklebust (2):
NFS: kswapd must not block in nfs_release_page
NFS: Fix a typo in include/linux/nfs_fs.h
Xiao Guangrong (1):
KVM: MMU: flush remote tlbs when overwriting spte with different pfn
Documentation/.gitignore new file +7 -0
@@ -0,0 +1,7 @@ +filesystems/dnotify_test +laptops/dslm +timers/hpet_example +vm/hugepage-mmap +vm/hugepage-shm +vm/map_hugetlb +
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 34 -EXTRAVERSION = .2 +EXTRAVERSION = .3 NAME = Sheep on Meth # *DOCUMENTATION*
arch/arm/plat-mxc/gpio.c +8 -0
@@ -215,13 +215,16 @@ static void _set_gpio_direction(struct gpio_chip *chip, unsigned offset,struct mxc_gpio_port *port = container_of(chip, struct mxc_gpio_port, chip);u32 l; +unsigned long flags; +spin_lock_irqsave (&port->lock, flags); l =__raw_readl (port->base +GPIO_GDIR );if (dir) l |=1 << offset;else l &= ~(1 << offset);__raw_writel (l, port->base +GPIO_GDIR ); +spin_unlock_irqrestore (&port->lock, flags); }static void mxc_gpio_set (struct gpio_chip *chip,unsigned offset,int value)
@@ -230,9 +233,12 @@ static void mxc_gpio_set(struct gpio_chip *chip, unsigned offset, int value) container_of(chip, struct mxc_gpio_port, chip);void __iomem *reg = port->base +GPIO_DR ;u32 l; +unsigned long flags; +spin_lock_irqsave (&port->lock, flags); l = (__raw_readl (reg) & (~(1 << offset))) | (value << offset);__raw_writel (l, reg); +spin_unlock_irqrestore (&port->lock, flags); }static int mxc_gpio_get (struct gpio_chip *chip,unsigned offset)
@@ -286,6 +292,8 @@ int __init mxc_gpio_init(struct mxc_gpio_port *port, int cnt) port[i].chip.base = i *32 ; port[i].chip.ngpio =32 ; +spin_lock_init (&port[i].lock); +/* its a serious configuration bug when it fails */ BUG_ON (gpiochip_add (&port[i].chip) <0 );
arch/arm/plat-mxc/include/mach/gpio.h +1 -0
@@ -36,6 +36,7 @@ struct mxc_gpio_port {int virtual_irq_start;struct gpio_chip chip;u32 both_edges; +spinlock_t lock; };int mxc_gpio_init (struct mxc_gpio_port *,int );
arch/parisc/kernel/firmware.c +2 -10
@@ -1123,7 +1123,6 @@ static char __attribute__((aligned(64))) iodc_dbuf[4096];*/ int pdc_iodc_print (const unsigned char *str,unsigned count) { -static int posx;/* for simple TAB-Simulation... */ unsigned int i;unsigned long flags;
@@ -1133,19 +1132,12 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) iodc_dbuf[i+0 ] ='\r' ; iodc_dbuf[i+1 ] ='\n' ; i +=2 ; - posx =0 ; goto print; -case '\t' : -while (posx &7 ) { - iodc_dbuf[i] =' ' ; - i++, posx++; - } -break ;case '\b' :/* BS */ - posx -=2 ; + i--;/* overwrite last */ default : iodc_dbuf[i] = str[i]; - i++, posx++; + i++;break ; } }
arch/x86/.gitignore new file +3 -0
@@ -0,0 +1,3 @@ +boot/compressed/vmlinux +tools/test_get_len +
arch/x86/kvm/mmu.c +2 -0
@@ -1901,6 +1901,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,pgprintk ("hfn old %lx new %lx\n" ,spte_to_pfn (*sptep), pfn);rmap_remove (vcpu->kvm, sptep); +__set_spte (sptep, shadow_trap_nonpresent_pte); +kvm_flush_remote_tlbs (vcpu->kvm); }else was_rmapped =1 ; }
arch/x86/xen/enlighten.c +1 -1
@@ -927,7 +927,7 @@ static const struct pv_init_ops xen_init_ops __initdata = { };static const struct pv_time_ops xen_time_ops__initdata = { - .sched_clock = xen_sched_clock, + .sched_clock = xen_clocksource_read, };static const struct pv_cpu_ops xen_cpu_ops__initdata = {
arch/x86/xen/time.c +0 -39
@@ -155,45 +155,6 @@ static void do_stolen_accounting(void)account_idle_ticks (ticks); } -/* -* Xen sched_clock implementation. Returns the number of unstolen -* nanoseconds, which is nanoseconds the VCPU spent in RUNNING+BLOCKED -* states. -*/ -unsigned long long xen_sched_clock (void ) -{ -struct vcpu_runstate_info state; -cycle_t now; -u64 ret; -s64 offset; - -/* -* Ideally sched_clock should be called on a per-cpu basis -* anyway, so preempt should already be disabled, but that's -* not current practice at the moment. -*/ -preempt_disable (); - - now =xen_clocksource_read (); - -get_runstate_snapshot (&state); - -WARN_ON (state.state != RUNSTATE_running); - - offset = now - state.state_entry_time; -if (offset <0 ) - offset =0 ; - - ret = state.time[RUNSTATE_blocked] + - state.time[RUNSTATE_running] + - offset; - -preempt_enable (); - -return ret; -} - -/* Get the TSC speed from Xen */ unsigned long xen_tsc_khz (void ) {
drivers/edac/amd64_edac.c +3 -3
@@ -178,7 +178,7 @@ static int amd64_set_scrub_rate(struct mem_ctl_info *mci, u32 *bandwidth)default :amd64_printk (KERN_ERR ,"Unsupported family!\n" ); -break ; +return -EINVAL ; }return amd64_search_set_scrub_rate (pvt->misc_f3_ctl, *bandwidth, min_scrubrate);
@@ -1430,7 +1430,7 @@ static inline u64 f10_get_base_addr_offset(u64 sys_addr, int hi_range_sel,u64 chan_off;if (hi_range_sel) { -if (!(dct_sel_base_addr &0xFFFFF800 ) && +if (!(dct_sel_base_addr &0xFFFF0000 ) && hole_valid && (sys_addr >=0x100000000ULL )) chan_off = hole_off <<16 ;else
@@ -1679,7 +1679,7 @@ static void f10_map_sysaddr_to_csrow(struct mem_ctl_info *mci,* ganged. Otherwise @chan should already contain the channel at * this point. */ -if (dct_ganging_enabled (pvt) && pvt->nbcfg &K8_NBCFG_CHIPKILL ) +if (dct_ganging_enabled (pvt) && (pvt->nbcfg &K8_NBCFG_CHIPKILL )) chan =get_channel_from_ecc_syndrome (mci, syndrome);if (chan >=0 )
drivers/gpu/drm/i915/intel_overlay.c +5 -2
@@ -950,7 +950,7 @@ static int check_overlay_src(struct drm_device *dev, || rec->src_width < N_HORIZ_Y_TAPS*4)return -EINVAL ; -/* check alingment constrains */ +/* check alignment constraints */ switch (rec->flags &I915_OVERLAY_TYPE_MASK ) {case I915_OVERLAY_RGB :/* not implemented */
@@ -982,7 +982,10 @@ static int check_overlay_src(struct drm_device *dev,return -EINVAL ;/* stride checking */ - stride_mask =63 ; +if (IS_I830 (dev) ||IS_845G (dev)) + stride_mask =255 ; +else + stride_mask =63 ;if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask)return -EINVAL ;
drivers/gpu/drm/radeon/r600.c +22 -2
@@ -361,7 +361,17 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev)u32 tmp;/* flush hdp cache so updates hit vram */ -WREG32 (R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL ,0x1 ); +if ((rdev->family >=CHIP_RV770 ) && (rdev->family <=CHIP_RV740 )) { +void __iomem *ptr = (void *)rdev->gart.table.vram.ptr; +u32 tmp; + +/* r7xx hw bug. write to HDP_DEBUG1 followed by fb read +* rather than write to HDP_REG_COHERENCY_FLUSH_CNTL +*/ +WREG32 (HDP_DEBUG1 ,0 ); + tmp =readl ((void __iomem *)ptr); + }else +WREG32 (R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL ,0x1 );WREG32 (VM_CONTEXT0_INVALIDATION_LOW_ADDR , rdev->mc.gtt_start >>12 );WREG32 (VM_CONTEXT0_INVALIDATION_HIGH_ADDR , (rdev->mc.gtt_end -1 ) >>12 );
@@ -2949,5 +2959,15 @@ int r600_debugfs_mc_info_init(struct radeon_device *rdev)*/ void r600_ioctl_wait_idle (struct radeon_device *rdev,struct radeon_bo *bo) { -WREG32 (R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL ,0x1 ); +/* r7xx hw bug. write to HDP_DEBUG1 followed by fb read +* rather than write to HDP_REG_COHERENCY_FLUSH_CNTL +*/ +if ((rdev->family >=CHIP_RV770 ) && (rdev->family <=CHIP_RV740 )) { +void __iomem *ptr = (void *)rdev->gart.table.vram.ptr; +u32 tmp; + +WREG32 (HDP_DEBUG1 ,0 ); + tmp =readl ((void __iomem *)ptr); + }else +WREG32 (R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL ,0x1 ); }
drivers/gpu/drm/radeon/r600d.h +1 -0
@@ -245,6 +245,7 @@#define HDP_NONSURFACE_SIZE 0x2C0C#define HDP_REG_COHERENCY_FLUSH_CNTL 0x54A0#define HDP_TILING_CONFIG 0x2F3C +#define HDP_DEBUG1 0x2F34#define MC_VM_AGP_TOP 0x2184#define MC_VM_AGP_BOT 0x2188
drivers/gpu/drm/radeon/radeon_atombios.c +6 -9
@@ -1024,21 +1024,18 @@ bool radeon_atombios_sideport_present(struct radeon_device *rdev)u8 frev, crev;u16 data_offset; +/* sideport is AMD only */ +if (rdev->family ==CHIP_RS600 ) +return false; +if (atom_parse_data_header (mode_info->atom_context, index,NULL , &frev, &crev, &data_offset)) { igp_info = (union igp_info *)(mode_info->atom_context->bios + data_offset);switch (crev) {case 1 : -/* AMD IGPS */ -if ((rdev->family ==CHIP_RS690 ) || - (rdev->family ==CHIP_RS740 )) { -if (igp_info->info.ulBootUpMemoryClock) -return true; - }else { -if (igp_info->info.ucMemoryType &0xf0 ) -return true; - } +if (igp_info->info.ulBootUpMemoryClock) +return true;break ;case 2 :if (igp_info->info_2.ucMemoryType &0x0f )
drivers/gpu/drm/radeon/radeon_combios.c +4 -0
@@ -693,6 +693,10 @@ bool radeon_combios_sideport_present(struct radeon_device *rdev)struct drm_device *dev = rdev->ddev;u16 igp_info; +/* sideport is AMD only */ +if (rdev->family ==CHIP_RS400 ) +return false; + igp_info =combios_get_table_offset (dev,COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE );if (igp_info) {
drivers/gpu/drm/radeon/rs600.c +0 -1
@@ -475,7 +475,6 @@ void rs600_mc_init(struct radeon_device *rdev) rdev->mc.igp_sideport_enabled =radeon_atombios_sideport_present (rdev); base =RREG32_MC (R_000004_MC_FB_LOCATION ); base =G_000004_MC_FB_START (base) <<16 ; - rdev->mc.igp_sideport_enabled =radeon_atombios_sideport_present (rdev);radeon_vram_location (rdev, &rdev->mc, base);radeon_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/gpu/drm/radeon/rs690.c +1 -1
@@ -158,8 +158,8 @@ void rs690_mc_init(struct radeon_device *rdev) rdev->mc.visible_vram_size = rdev->mc.aper_size; base =RREG32_MC (R_000100_MCCFG_FB_LOCATION ); base =G_000100_MC_FB_START (base) <<16 ; -rs690_pm_info (rdev); rdev->mc.igp_sideport_enabled =radeon_atombios_sideport_present (rdev); +rs690_pm_info (rdev);radeon_vram_location (rdev, &rdev->mc, base);radeon_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/gpu/drm/radeon/rv770.c +4 -1
@@ -174,7 +174,10 @@ static void rv770_mc_program(struct radeon_device *rdev)WREG32 ((0x2c20 + j),0x00000000 );WREG32 ((0x2c24 + j),0x00000000 ); } -WREG32 (HDP_REG_COHERENCY_FLUSH_CNTL ,0 ); +/* r7xx hw bug. Read from HDP_DEBUG1 rather +* than writing to HDP_REG_COHERENCY_FLUSH_CNTL +*/ + tmp =RREG32 (HDP_DEBUG1 );rv515_mc_stop (rdev, &save);if (r600_mc_wait_for_idle (rdev)) {
drivers/gpu/drm/radeon/rv770d.h +1 -0
@@ -128,6 +128,7 @@#define HDP_NONSURFACE_SIZE 0x2C0C#define HDP_REG_COHERENCY_FLUSH_CNTL 0x54A0#define HDP_TILING_CONFIG 0x2F3C +#define HDP_DEBUG1 0x2F34#define MC_SHARED_CHMAP 0x2004#define NOOFCHAN_SHIFT 12
drivers/misc/enclosure.c +5 -2
@@ -285,8 +285,11 @@ enclosure_component_register(struct enclosure_device *edev, cdev->groups = enclosure_groups; err =device_register (cdev); -if (err) -ERR_PTR (err); +if (err) { + ecomp->number =-1 ; +put_device (cdev); +return ERR_PTR (err); + }return ecomp; }
drivers/net/e1000e/hw.h +1 -1
@@ -306,7 +306,7 @@ enum e1e_registers {#define E1000_KMRNCTRLSTA_INBAND_PARAM 0x9/* Kumeran InBand Parameters */ #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000/* Nearend Loopback mode */ #define E1000_KMRNCTRLSTA_K1_CONFIG 0x7 -#define E1000_KMRNCTRLSTA_K1_ENABLE 0x140E +#define E1000_KMRNCTRLSTA_K1_ENABLE 0x0002#define E1000_KMRNCTRLSTA_K1_DISABLE 0x1400#define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10
drivers/net/e1000e/netdev.c +9 -4
@@ -3041,13 +3041,18 @@ static int e1000_test_msi(struct e1000_adapter *adapter)/* disable SERR in case the MSI write causes a master abort */ pci_read_config_word (adapter->pdev,PCI_COMMAND , &pci_cmd); -pci_write_config_word (adapter->pdev,PCI_COMMAND , - pci_cmd & ~PCI_COMMAND_SERR ); +if (pci_cmd &PCI_COMMAND_SERR ) +pci_write_config_word (adapter->pdev,PCI_COMMAND , + pci_cmd & ~PCI_COMMAND_SERR ); err =e1000_test_msi_interrupt (adapter); -/* restore previous setting of command word */ -pci_write_config_word (adapter->pdev,PCI_COMMAND , pci_cmd); +/* re-enable SERR */ +if (pci_cmd &PCI_COMMAND_SERR ) { +pci_read_config_word (adapter->pdev,PCI_COMMAND , &pci_cmd); + pci_cmd |=PCI_COMMAND_SERR ; +pci_write_config_word (adapter->pdev,PCI_COMMAND , pci_cmd); + }/* success ! */ if (!err)
drivers/net/igb/igb_main.c +4 -4
@@ -322,9 +322,6 @@ static void igb_cache_ring_register(struct igb_adapter *adapter)for (; i < adapter->rss_queues; i++) adapter->rx_ring[i]->reg_idx = rbase_offset +Q_IDX_82576 (i); -for (; j < adapter->rss_queues; j++) - adapter->tx_ring[j]->reg_idx = rbase_offset + -Q_IDX_82576 (j); }case e1000_82575:case e1000_82580:
@@ -685,7 +682,10 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)/* Number of supported queues. */ adapter->num_rx_queues = adapter->rss_queues; - adapter->num_tx_queues = adapter->rss_queues; +if (adapter->vfs_allocated_count) + adapter->num_tx_queues =1 ; +else + adapter->num_tx_queues = adapter->rss_queues;/* start with one vector for every rx queue */ numvecs = adapter->num_rx_queues;
drivers/net/wireless/ath/ath9k/eeprom_def.c +1 -1
@@ -721,7 +721,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah, vpdTableI[i][sizeCurrVpdTable - 2]); vpdStep = (int16_t )((vpdStep <1 ) ?1 : vpdStep); -if (tgtIndex > maxIndex) { +if (tgtIndex >= maxIndex) {while ((ss <= tgtIndex) && (k < (AR5416_NUM_PDADC_VALUES -1 ))) { tmpVal = (int16_t)((vpdTableI[i][sizeCurrVpdTable - 1] +
drivers/net/wireless/ath/ath9k/hw.c +16 -3
@@ -863,7 +863,8 @@ int ath9k_hw_init(struct ath_hw *ah)if (ah->config.serialize_regmode ==SER_REG_MODE_AUTO ) {if (ah->hw_version.macVersion ==AR_SREV_VERSION_5416_PCI || - (AR_SREV_9280 (ah) && !ah->is_pciexpress)) { + ((AR_SREV_9160 (ah) ||AR_SREV_9280 (ah)) && + !ah->is_pciexpress)) { ah->config.serialize_regmode =SER_REG_MODE_ON ; }else {
@@ -1955,7 +1956,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, macStaId1 =REG_READ (ah,AR_STA_ID1 ) &AR_STA_ID1_BASE_RATE_11B ;/* For chips on which RTC reset is done, save TSF before it gets cleared */ -if (AR_SREV_9280 (ah) && ah->eep_ops->get_eeprom (ah,EEP_OL_PWRCTRL )) +if (AR_SREV_9100 (ah) || + (AR_SREV_9280 (ah) && ah->eep_ops->get_eeprom (ah,EEP_OL_PWRCTRL ))) tsf =ath9k_hw_gettsf64 (ah); saveLedState = REG_READ(ah, AR_CFG_LED) &
@@ -1985,7 +1987,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, }/* Restore TSF */ -if (tsf &&AR_SREV_9280 (ah) && ah->eep_ops->get_eeprom (ah,EEP_OL_PWRCTRL )) +if (tsf)ath9k_hw_settsf64 (ah, tsf);if (AR_SREV_9280_10_OR_LATER (ah))
@@ -2005,6 +2007,17 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,if (r)return r; +/* +* Some AR91xx SoC devices frequently fail to accept TSF writes +* right after the chip reset. When that happens, write a new +* value after the initvals have been applied, with an offset +* based on measured time difference +*/ +if (AR_SREV_9100 (ah) && (ath9k_hw_gettsf64 (ah) < tsf)) { + tsf +=1500 ; +ath9k_hw_settsf64 (ah, tsf); + } +/* Setup MFP options for CCMP */ if (AR_SREV_9280_20_OR_LATER (ah)) {/* Mask Retry(b11), PwrMgt(b12), MoreData(b13) to 0 in mgmt
drivers/net/wireless/ath/ath9k/xmit.c +34 -34
91 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-scan.c +8 -10
@@ -607,11 +607,10 @@ void iwl_bg_scan_check(struct work_struct *data)return ;mutex_lock (&priv->mutex); -if (test_bit (STATUS_SCANNING , &priv->status) || -test_bit (STATUS_SCAN_ABORTING , &priv->status)) { -IWL_DEBUG_SCAN (priv,"Scan completion watchdog resetting " -"adapter (%dms)\n" , -jiffies_to_msecs (IWL_SCAN_CHECK_WATCHDOG )); +if (test_bit (STATUS_SCANNING , &priv->status) && + !test_bit (STATUS_SCAN_ABORTING , &priv->status)) { +IWL_DEBUG_SCAN (priv,"Scan completion watchdog (%dms)\n" , +jiffies_to_msecs (IWL_SCAN_CHECK_WATCHDOG ));if (!test_bit (STATUS_EXIT_PENDING , &priv->status))iwl_send_scan_abort (priv);
@@ -950,12 +949,11 @@ void iwl_bg_abort_scan(struct work_struct *work) !test_bit(STATUS_GEO_CONFIGURED, &priv->status)) return; -mutex_lock (&priv->mutex); - -cancel_delayed_work_sync (&priv->scan_check); -set_bit (STATUS_SCAN_ABORTING , &priv->status); -iwl_send_scan_abort (priv); +cancel_delayed_work (&priv->scan_check); +mutex_lock (&priv->mutex); +if (test_bit (STATUS_SCAN_ABORTING , &priv->status)) +iwl_send_scan_abort (priv);mutex_unlock (&priv->mutex); }EXPORT_SYMBOL (iwl_bg_abort_scan);
drivers/parisc/led.c +4 -2
@@ -176,16 +176,18 @@ static ssize_t led_proc_write(struct file *file, const char *buf, size_t count, loff_t *pos) { void *data = PDE(file->f_path.dentry->d_inode)->data; -char *cur, lbuf[count +1 ]; +char *cur, lbuf[32 ];int d;if (!capable (CAP_SYS_ADMIN ))return -EACCES ; -memset (lbuf,0 , count +1 ); +if (count >=sizeof (lbuf)) + count =sizeof (lbuf)-1 ;if (copy_from_user (lbuf, buf, count))return -EFAULT ; + lbuf[count] =0 ; cur = lbuf;
drivers/ssb/driver_chipcommon_pmu.c +10 -7
@@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc)chipco_write32 (cc,SSB_CHIPCO_PMU_MAXRES_MSK , max_msk); } -/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */ void ssb_pmu_init (struct ssb_chipcommon *cc) { +struct ssb_bus *bus = cc->dev->bus;u32 pmucap;if (!(cc->capabilities &SSB_CHIPCO_CAP_PMU ))
@@ -516,12 +516,15 @@ void ssb_pmu_init(struct ssb_chipcommon *cc) ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n", cc->pmu.rev, pmucap); -if (cc->pmu.rev ==1 ) -chipco_mask32 (cc,SSB_CHIPCO_PMU_CTL , - ~SSB_CHIPCO_PMU_CTL_NOILPONW ); -else -chipco_set32 (cc,SSB_CHIPCO_PMU_CTL , -SSB_CHIPCO_PMU_CTL_NOILPONW ); +if (cc->pmu.rev >=1 ) { +if ((bus->chip_id ==0x4325 ) && (bus->chip_rev <2 )) { +chipco_mask32 (cc,SSB_CHIPCO_PMU_CTL , + ~SSB_CHIPCO_PMU_CTL_NOILPONW ); + }else { +chipco_set32 (cc,SSB_CHIPCO_PMU_CTL , +SSB_CHIPCO_PMU_CTL_NOILPONW ); + } + }ssb_pmu_pll_init (cc);ssb_pmu_resources_init (cc); }
drivers/ssb/pci.c +4 -16
@@ -23,7 +23,6 @@#include "ssb_private.h" -bool ssb_is_sprom_available (struct ssb_bus *bus);/* Define the following to 1 to enable a printk on each coreswitch. */ #define SSB_VERBOSE_PCICORESWITCH_DEBUG 0
@@ -169,7 +168,7 @@ err_pci: }/* Get the word-offset for a SSB_SPROM_XXX define. */ -#define SPOFF (offset) ((offset) / sizeof(u16)) +#define SPOFF (offset) (((offset) - SSB_SPROM_BASE1) / sizeof(u16))/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */ #define SPEX16 (_outvar, _offset, _mask, _shift) \ out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
@@ -254,11 +253,6 @@ static int sprom_do_read(struct ssb_bus *bus, u16 *sprom) {int i; -/* Check if SPROM can be read */ -if (ioread16 (bus->mmio + bus->sprom_offset) ==0xFFFF ) { - ssb_printk(KERN_ERR PFX "Unable to read SPROM\n"); -return -ENODEV ; - }for (i =0 ; i < bus->sprom_size; i++) sprom[i] =ioread16 (bus->mmio + bus->sprom_offset + (i *2 ));
@@ -653,23 +647,17 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,if (!buf) goto out; bus->sprom_size =SSB_SPROMSIZE_WORDS_R123 ; - err =sprom_do_read (bus, buf); -if (err) - goto out_free; +sprom_do_read (bus, buf); err =sprom_check_crc (buf, bus->sprom_size);if (err) {/* try for a 440 byte SPROM - revision 4 and higher */ kfree (buf); buf =kcalloc (SSB_SPROMSIZE_WORDS_R4 ,sizeof (u16),GFP_KERNEL ); -if (!buf) { - err = -ENOMEM ; +if (!buf) goto out; - } bus->sprom_size =SSB_SPROMSIZE_WORDS_R4 ; - err =sprom_do_read (bus, buf); -if (err) - goto out_free; +sprom_do_read (bus, buf); err =sprom_check_crc (buf, bus->sprom_size);if (err) {/* All CRC attempts failed.
drivers/staging/comedi/Kconfig +5 -0
@@ -16,6 +16,7 @@ config COMEDI_DEBUG config COMEDI_PCI_DRIVERS tristate "Comedi PCI drivers" depends on COMEDI && PCI + select COMEDI_8255 default N ---help--- Enable lots of comedi PCI drivers to be built
@@ -23,6 +24,7 @@ config COMEDI_PCI_DRIVERS config COMEDI_PCMCIA_DRIVERS tristate "Comedi PCMCIA drivers" depends on COMEDI && PCMCIA && PCCARD + select COMEDI_8255 default N ---help--- Enable lots of comedi PCMCIA and PCCARD drivers to be built
@@ -33,3 +35,6 @@ config COMEDI_USB_DRIVERS default N ---help--- Enable lots of comedi USB drivers to be built + +config COMEDI_8255 + tristate
drivers/staging/comedi/drivers/Makefile +3 -1
@@ -8,8 +8,10 @@ obj-$(CONFIG_COMEDI) += comedi_test.o obj-$(CONFIG_COMEDI) += comedi_parport.o obj-$(CONFIG_COMEDI) += pcm_common.o +# Comedi 8255 module +obj-$(CONFIG_COMEDI_8255) += 8255.o + # Comedi PCI drivers -obj-$(CONFIG_COMEDI_PCI_DRIVERS) += 8255.o obj-$(CONFIG_COMEDI_PCI_DRIVERS) += acl7225b.o obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_035.o obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_1032.o
drivers/usb/core/hcd.c +2 -1
@@ -1330,7 +1330,7 @@ static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, urb->setup_dma))return -EAGAIN ; urb->transfer_flags |=URB_SETUP_MAP_SINGLE ; - }else if (hcd->driver->flags &HCD_LOCAL_MEM ) + }else if (hcd->driver->flags &HCD_LOCAL_MEM ) { ret = hcd_alloc_coherent( urb->dev->bus, mem_flags, &urb->setup_dma,
@@ -1340,6 +1340,7 @@ static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,if (ret)return ret; urb->transfer_flags |=URB_SETUP_MAP_LOCAL ; + } } dir =usb_urb_dir_in (urb) ?DMA_FROM_DEVICE :DMA_TO_DEVICE ;
fs/gfs2/dir.c +1 -1
@@ -392,7 +392,7 @@ static int gfs2_dirent_find_space(const struct gfs2_dirent *dent,unsigned totlen =be16_to_cpu (dent->de_rec_len);if (gfs2_dirent_sentinel (dent)) - actual =GFS2_DIRENT_SIZE (0 ); + actual =0 ;if (totlen - actual >= required)return 1 ;return 0 ;
fs/nfs/file.c +11 -2
@@ -27,6 +27,7 @@#include <linux/pagemap.h> #include <linux/aio.h> #include <linux/gfp.h> +#include <linux/swap.h> #include <asm/uaccess.h> #include <asm/system.h>
@@ -489,11 +490,19 @@ static void nfs_invalidate_page(struct page *page, unsigned long offset)*/ static int nfs_release_page (struct page *page,gfp_t gfp) { +struct address_space *mapping = page->mapping; +dfprintk (PAGECACHE ,"NFS: release_page(%p)\n" , page);/* Only do I/O if gfp is a superset of GFP_KERNEL */ -if ((gfp &GFP_KERNEL ) ==GFP_KERNEL ) -nfs_wb_page (page->mapping->host, page); +if (mapping && (gfp &GFP_KERNEL ) ==GFP_KERNEL ) { +int how =FLUSH_SYNC ; + +/* Don't let kswapd deadlock waiting for OOM RPC calls */ +if (current_is_kswapd ()) + how =0 ; +nfs_commit_inode (mapping->host, how); + }/* If PagePrivate() is set, then the page is not freeable */ if (PagePrivate (page))return 0 ;
fs/nfs/write.c +1 -6
@@ -1379,7 +1379,7 @@ static const struct rpc_call_ops nfs_commit_ops = { .rpc_release = nfs_commit_release, }; -static int nfs_commit_inode (struct inode *inode,int how) +int nfs_commit_inode (struct inode *inode,int how) {LIST_HEAD (head);int may_wait = how &FLUSH_SYNC ;
@@ -1443,11 +1443,6 @@ out_mark_dirty: return ret; }#else -static int nfs_commit_inode (struct inode *inode,int how) -{ -return 0 ; -} -static int nfs_commit_unstable_pages (struct inode *inode,struct writeback_control *wbc) {return 0 ;
include/drm/drm_pciids.h +7 -0
@@ -146,6 +146,8 @@ {0x1002, 0x6888, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYPRESS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6889, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYPRESS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x688A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYPRESS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x688C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYPRESS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x688D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYPRESS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6898, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYPRESS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6899, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYPRESS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x689c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HEMLOCK|RADEON_NEW_MEMMAP}, \
@@ -161,6 +163,7 @@ {0x1002, 0x68be, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_JUNIPER|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_REDWOOD|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68c1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_REDWOOD|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x68c7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_REDWOOD|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68c8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_REDWOOD|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68c9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_REDWOOD|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_REDWOOD|RADEON_NEW_MEMMAP}, \
@@ -174,6 +177,7 @@ {0x1002, 0x68e8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CEDAR|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68e9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CEDAR|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68f1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CEDAR|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x68f2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CEDAR|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68f8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CEDAR|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68f9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CEDAR|RADEON_NEW_MEMMAP}, \ {0x1002, 0x68fe, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CEDAR|RADEON_NEW_MEMMAP}, \
@@ -314,6 +318,7 @@ {0x1002, 0x9456, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ {0x1002, 0x945A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x945B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x945E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_NEW_MEMMAP}, \ {0x1002, 0x946A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -324,6 +329,7 @@ {0x1002, 0x9487, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9488, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9489, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x948A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x948F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9490, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9491, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV730|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -366,6 +372,7 @@ {0x1002, 0x9553, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9555, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9557, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x955f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV710|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9580, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9581, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x9583, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV630|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
include/linux/nfs_fs.h +7 -0
@@ -479,8 +479,15 @@ extern int nfs_wb_all(struct inode *inode);extern int nfs_wb_page (struct inode *inode,struct page * page);extern int nfs_wb_page_cancel (struct inode *inode,struct page * page);#if defined(CONFIG_NFS_V3 ) || defined(CONFIG_NFS_V4 ) +extern int nfs_commit_inode (struct inode *,int );extern struct nfs_write_data *nfs_commitdata_alloc (void );extern void nfs_commit_free (struct nfs_write_data *wdata); +#else +static inline int +nfs_commit_inode (struct inode *inode,int how) +{ +return 0 ; +}#endif static inline int
include/linux/ssb/ssb.h +4 -1
@@ -305,8 +305,8 @@ struct ssb_bus {/* ID information about the Chip. */ u16 chip_id;u16 chip_rev; -u16 sprom_size;/* number of words in sprom */ u16 sprom_offset; +u16 sprom_size;/* number of words in sprom */ u8 chip_package;/* List of devices (cores) on the backplane. */
@@ -395,6 +395,9 @@ extern int ssb_bus_sdiobus_register(struct ssb_bus *bus,extern void ssb_bus_unregister (struct ssb_bus *bus); +/* Does the device have an SPROM? */ +extern bool ssb_is_sprom_available (struct ssb_bus *bus); +/* Set a fallback SPROM. * See kdoc at the function definition for complete documentation. */ extern int ssb_arch_set_fallback_sprom (const struct ssb_sprom *sprom);
include/linux/ssb/ssb_driver_chipcommon.h +14 -1
@@ -46,7 +46,6 @@#define SSB_PLLTYPE_7 0x00038000/* 25Mhz, 4 dividers */ #define SSB_CHIPCO_CAP_PCTL 0x00040000/* Power Control */ #define SSB_CHIPCO_CAP_OTPS 0x00380000/* OTP size */ -#define SSB_CHIPCO_CAP_SPROM 0x40000000/* SPROM present */ #define SSB_CHIPCO_CAP_OTPS_SHIFT 19#define SSB_CHIPCO_CAP_OTPS_BASE 5#define SSB_CHIPCO_CAP_JTAGM 0x00400000/* JTAG master present */
@@ -54,6 +53,7 @@#define SSB_CHIPCO_CAP_64BIT 0x08000000/* 64-bit Backplane */ #define SSB_CHIPCO_CAP_PMU 0x10000000/* PMU available (rev >= 20) */ #define SSB_CHIPCO_CAP_ECI 0x20000000/* ECI available (rev >= 20) */ +#define SSB_CHIPCO_CAP_SPROM 0x40000000/* SPROM present */ #define SSB_CHIPCO_CORECTL 0x0008#define SSB_CHIPCO_CORECTL_UARTCLK0 0x00000001/* Drive UART with internal clock */ #define SSB_CHIPCO_CORECTL_SE 0x00000002/* sync clk out enable (corerev >= 3) */
@@ -386,6 +386,7 @@/** Chip specific Chip-Status register contents. */ +#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS 0x00000040/* SPROM present */ #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL 0x00000003#define SSB_CHIPCO_CHST_4325_DEFCIS_SEL 0/* OTP is powered up, use def. CIS, no SPROM */ #define SSB_CHIPCO_CHST_4325_SPROM_SEL 1/* OTP is powered up, SPROM is present */
@@ -399,6 +400,18 @@#define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT 4#define SSB_CHIPCO_CHST_4325_PMUTOP_2B 0x00000200/* 1 for 2b, 0 for to 2a */ +/** Macros to determine SPROM presence based on Chip-Status register. */ +#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT (status) \ + ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \ + SSB_CHIPCO_CHST_4325_OTP_SEL) +#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT (status) \ + (status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS) +#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT (status) \ + (((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \ + SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \ + ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \ + SSB_CHIPCO_CHST_4325_OTP_SEL)) +/** Clockcontrol masks and values **/
mm/memory.c +13 -3
@@ -1385,10 +1385,20 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,return i ? : -EFAULT ; }if (pages) { -struct page *page =vm_normal_page (gate_vma, start, *pte); +struct page *page; + + page =vm_normal_page (gate_vma, start, *pte); +if (!page) { +if (!(gup_flags &FOLL_DUMP ) && +is_zero_pfn (pte_pfn (*pte))) + page =pte_page (*pte); +else { +pte_unmap (pte); +return i ? : -EFAULT ; + } + } pages[i] = page; -if (page) -get_page (page); +get_page (page); }pte_unmap (pte);if (vmas)
net/9p/trans_fd.c +1 -1
@@ -948,7 +948,7 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args) csocket =NULL ; -if (strlen (addr) >UNIX_PATH_MAX ) { +if (strlen (addr) >=UNIX_PATH_MAX ) {P9_EPRINTK (KERN_ERR ,"p9_trans_unix: address too long: %s\n" , addr);return -ENAMETOOLONG ;
net/mac80211/mesh_plink.c +31 -11
122 lines not on this page · raw message
net/wireless/mlme.c +4 -4
@@ -44,10 +44,10 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len) } } -WARN_ON (!done); - -nl80211_send_rx_auth (rdev, dev, buf, len,GFP_KERNEL ); -cfg80211_sme_rx_auth (dev, buf, len); +if (done) { +nl80211_send_rx_auth (rdev, dev, buf, len,GFP_KERNEL ); +cfg80211_sme_rx_auth (dev, buf, len); + }wdev_unlock (wdev); }
net/wireless/scan.c +5 -0
@@ -275,6 +275,7 @@ struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy, {struct cfg80211_registered_device *dev =wiphy_to_dev (wiphy);struct cfg80211_internal_bss *bss, *res =NULL ; +unsigned long now = jiffies;spin_lock_bh (&dev->bss_lock);
@@ -283,6 +284,10 @@ struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy,continue ;if (channel && bss->pub.channel != channel)continue ; +/* Don't get expired BSS structs */ +if (time_after (now, bss->ts +IEEE80211_SCAN_RESULT_EXPIRE ) && + !atomic_read (&bss->hold)) +continue ;if (is_bss (&bss->pub, bssid, ssid, ssid_len)) { res = bss;kref_get (&res->ref);