Linux 2.6.35.1
Subsystems (26)
I'm announcing the release of the 2.6.35.1 kernel.
All users of the 2.6.35 kernel series should upgrade.
The updated 2.6.35.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.35.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.35.y.git;a=summarythanks,
greg k-h
------------
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/xen/enlighten.c | 2 arch/x86/xen/time.c | 39 ------ drivers/edac/amd64_edac.c | 6 - drivers/gpu/drm/i915/intel_display.c | 144 ++++++++++++++++--------- drivers/gpu/drm/i915/intel_drv.h | 8 + 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_object.c | 27 +++- drivers/gpu/drm/radeon/rs690.c | 27 +--- drivers/gpu/drm/radeon/rv515.c | 23 +-- 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/ar9002_calib.c | 2 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 drivers/net/wireless/ath/ath9k/eeprom.h | 2 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 4 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 4 drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 - drivers/net/wireless/ath/ath9k/hw.c | 23 +++ drivers/net/wireless/ath/ath9k/xmit.c | 95 ++++++++++------ drivers/net/wireless/iwlwifi/iwl-scan.c | 18 +-- drivers/net/xen-netfront.c | 1 drivers/parisc/led.c | 6 - drivers/ssb/driver_chipcommon.c | 1 drivers/ssb/pci.c | 15 ++ fs/block_dev.c | 4 include/drm/drm_pciids.h | 7 + include/linux/netdevice.h | 2 include/linux/notifier.h | 1 kernel/signal.c | 9 + net/9p/trans_fd.c | 2 net/ipv4/devinet.c | 1 net/mac80211/mesh_plink.c | 42 +++++-- net/sched/sch_generic.c | 18 +++ net/wireless/mlme.c | 8 - net/wireless/scan.c | 5 45 files changed, 395 insertions(+), 250 deletions(-)
Alex Deucher (3):
drm/radeon: add new pci ids
drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush drm/radeon/kms: handle the case of no active displays properly in the bandwidth code
Baruch Siach (1):
arm/imx/gpio: add spinlock protection
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 (2):
drm/i915: Unset cursor if out-of-bounds upon mode change (v4) drm/i915: Check overlay stride errata for i830 and i845
Dan Carpenter (1):
9p: strlen() doesn't count the terminator
David Howells (1):
CRED: Fix RCU warning due to previous patch fixing __task_cred()'s checks
Dean Nelson (1):
e1000e: don't inadvertently re-set INTX_DISABLE
Felix Fietkau (10):
ath9k: fix a potential buffer leak in the STA teardown path
ath9k_hw: prevent a fast channel change after a rx DMA stuck issue
ath9k_hw: fix a sign error in the IQ calibration code
ath9k_hw: fix an off-by-one error in the PDADC boundaries calculation
ath9k: fix retry count for A-MPDU rate control status reports
ath9k: fix a buffer leak in A-MPDU completion
ath9k: another fix for the A-MPDU buffer leak
ath9k: fix TSF after reset on AR913x
ath9k: fix yet another buffer leak in the tx aggregation code
ath9k_hw: fix antenna diversity on AR9285
Greg Kroah-Hartman (1):
Linux 2.6.35.1
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()
Ian Campbell (2):
arp_notify: allow drivers to explicitly request a notification event.
xen: netfront: explicitly generate arp_notify event after migration.
James Bottomley (1):
SCSI: enclosure: fix error path - actually return ERR_PTR() on error
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 (2):
ath9k: enable serialize_regmode for non-PCIE AR9160
mac80211: avoid scheduling while atomic in mesh_rx_plink_frame
Kyle McMartin (1):
parisc: pass through '\t' to early (iodc) console
Larry Finger (1):
ssb: Handle alternate SSPROM location
Michel Dänzer (1):
drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.
Stanislaw Gruszka (1):
iwlwifi: fix scan abort
Tejun Heo (1):
block_dev: always serialize exclusive open attempts
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 35 -EXTRAVERSION = +EXTRAVERSION = .1 NAME = Sheep on Meth # *DOCUMENTATION*
arch/arm/plat-mxc/gpio.c +8 -0
@@ -214,13 +214,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)
@@ -229,9 +232,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)
@@ -285,6 +291,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/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_display.c +93 -51
202 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +6 -2
@@ -143,8 +143,6 @@ struct intel_crtc {struct drm_crtc base;enum pipe pipe;enum plane plane; -struct drm_gem_object *cursor_bo; -uint32_t cursor_addr;u8 lut_r[256 ], lut_g[256 ], lut_b[256 ];int dpms_mode;bool busy;/* is scanout buffer being updated frequently? */
@@ -153,6 +151,12 @@ struct intel_crtc {struct intel_overlay *overlay;struct intel_unpin_work *unpin_work;int fdi_lanes; + +struct drm_gem_object *cursor_bo; +uint32_t cursor_addr; +int16_t cursor_x, cursor_y; +int16_t cursor_width, cursor_height; +bool cursor_visble; };#define to_intel_crtc (x) container_of(x, struct intel_crtc, base)
drivers/gpu/drm/i915/intel_overlay.c +5 -2
@@ -958,7 +958,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 */
@@ -990,7 +990,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
@@ -869,7 +869,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 );
@@ -3512,5 +3522,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_object.c +18 -9
@@ -110,6 +110,7 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, bo->surface_reg =-1 ;INIT_LIST_HEAD (&bo->list); +retry:radeon_ttm_placement_from_domain (bo, domain);/* Kernel allocation are uninterruptible */ mutex_lock (&rdev->vram_mutex);
@@ -118,10 +119,15 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, &radeon_ttm_bo_destroy);mutex_unlock (&rdev->vram_mutex);if (unlikely (r !=0 )) { -if (r != -ERESTARTSYS ) +if (r != -ERESTARTSYS ) { +if (domain ==RADEON_GEM_DOMAIN_VRAM ) { + domain |=RADEON_GEM_DOMAIN_GTT ; + goto retry; + }dev_err (rdev->dev,"object_init failed for (%lu, 0x%08X)\n" , size, domain); + }return r; } *bo_ptr = bo;
@@ -321,6 +327,7 @@ int radeon_bo_list_validate(struct list_head *head) {struct radeon_bo_list *lobj;struct radeon_bo *bo; +u32 domain;int r;list_for_each_entry (lobj, head, list) {
@@ -333,17 +340,19 @@ int radeon_bo_list_validate(struct list_head *head)list_for_each_entry (lobj, head, list) { bo = lobj->bo;if (!bo->pin_count) { -if (lobj->wdomain) { -radeon_ttm_placement_from_domain (bo, - lobj->wdomain); - }else { -radeon_ttm_placement_from_domain (bo, - lobj->rdomain); - } + domain = lobj->wdomain ? lobj->wdomain : lobj->rdomain; + + retry: +radeon_ttm_placement_from_domain (bo, domain); r =ttm_bo_validate (&bo->tbo, &bo->placement, true, false, false); -if (unlikely (r)) +if (unlikely (r)) { +if (r != -ERESTARTSYS && domain ==RADEON_GEM_DOMAIN_VRAM ) { + domain |=RADEON_GEM_DOMAIN_GTT ; + goto retry; + }return r; + } } lobj->gpu_offset =radeon_bo_gpu_offset (bo); lobj->tiling_flags = bo->tiling_flags;
drivers/gpu/drm/radeon/rs690.c +9 -18
@@ -398,7 +398,9 @@ void rs690_bandwidth_update(struct radeon_device *rdev)struct drm_display_mode *mode1 =NULL ;struct rs690_watermark wm0;struct rs690_watermark wm1; -u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt; +u32 tmp; +u32 d1mode_priority_a_cnt =S_006548_D1MODE_PRIORITY_A_OFF (1 ); +u32 d2mode_priority_a_cnt =S_006548_D1MODE_PRIORITY_A_OFF (1 );fixed20_12 priority_mark02, priority_mark12, fill_rate;fixed20_12 a, b;
@@ -495,10 +497,6 @@ void rs690_bandwidth_update(struct radeon_device *rdev) d1mode_priority_a_cnt |=S_006548_D1MODE_PRIORITY_A_ALWAYS_ON (1 ); d2mode_priority_a_cnt |=S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON (1 ); } -WREG32 (R_006548_D1MODE_PRIORITY_A_CNT , d1mode_priority_a_cnt); -WREG32 (R_00654C_D1MODE_PRIORITY_B_CNT , d1mode_priority_a_cnt); -WREG32 (R_006D48_D2MODE_PRIORITY_A_CNT , d2mode_priority_a_cnt); -WREG32 (R_006D4C_D2MODE_PRIORITY_B_CNT , d2mode_priority_a_cnt); }else if (mode0) {if (dfixed_trunc (wm0.dbpp) >64 ) a.full =dfixed_mul (wm0.dbpp, wm0.num_line_pair);
@@ -528,13 +526,7 @@ void rs690_bandwidth_update(struct radeon_device *rdev) d1mode_priority_a_cnt =dfixed_trunc (priority_mark02);if (rdev->disp_priority ==2 ) d1mode_priority_a_cnt |=S_006548_D1MODE_PRIORITY_A_ALWAYS_ON (1 ); -WREG32 (R_006548_D1MODE_PRIORITY_A_CNT , d1mode_priority_a_cnt); -WREG32 (R_00654C_D1MODE_PRIORITY_B_CNT , d1mode_priority_a_cnt); -WREG32 (R_006D48_D2MODE_PRIORITY_A_CNT , -S_006D48_D2MODE_PRIORITY_A_OFF (1 )); -WREG32 (R_006D4C_D2MODE_PRIORITY_B_CNT , -S_006D4C_D2MODE_PRIORITY_B_OFF (1 )); - }else { + }else if (mode1) {if (dfixed_trunc (wm1.dbpp) >64 ) a.full =dfixed_mul (wm1.dbpp, wm1.num_line_pair);else
@@ -563,13 +555,12 @@ void rs690_bandwidth_update(struct radeon_device *rdev) d2mode_priority_a_cnt =dfixed_trunc (priority_mark12);if (rdev->disp_priority ==2 ) d2mode_priority_a_cnt |=S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON (1 ); -WREG32 (R_006548_D1MODE_PRIORITY_A_CNT , -S_006548_D1MODE_PRIORITY_A_OFF (1 )); -WREG32 (R_00654C_D1MODE_PRIORITY_B_CNT , -S_00654C_D1MODE_PRIORITY_B_OFF (1 )); -WREG32 (R_006D48_D2MODE_PRIORITY_A_CNT , d2mode_priority_a_cnt); -WREG32 (R_006D4C_D2MODE_PRIORITY_B_CNT , d2mode_priority_a_cnt); } + +WREG32 (R_006548_D1MODE_PRIORITY_A_CNT , d1mode_priority_a_cnt); +WREG32 (R_00654C_D1MODE_PRIORITY_B_CNT , d1mode_priority_a_cnt); +WREG32 (R_006D48_D2MODE_PRIORITY_A_CNT , d2mode_priority_a_cnt); +WREG32 (R_006D4C_D2MODE_PRIORITY_B_CNT , d2mode_priority_a_cnt); }uint32_t rs690_mc_rreg (struct radeon_device *rdev,uint32_t reg)
drivers/gpu/drm/radeon/rv515.c +9 -14
@@ -925,7 +925,9 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)struct drm_display_mode *mode1 =NULL ;struct rv515_watermark wm0;struct rv515_watermark wm1; -u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt; +u32 tmp; +u32 d1mode_priority_a_cnt =MODE_PRIORITY_OFF ; +u32 d2mode_priority_a_cnt =MODE_PRIORITY_OFF ;fixed20_12 priority_mark02, priority_mark12, fill_rate;fixed20_12 a, b;
@@ -999,10 +1001,6 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev) d1mode_priority_a_cnt |=MODE_PRIORITY_ALWAYS_ON ; d2mode_priority_a_cnt |=MODE_PRIORITY_ALWAYS_ON ; } -WREG32 (D1MODE_PRIORITY_A_CNT , d1mode_priority_a_cnt); -WREG32 (D1MODE_PRIORITY_B_CNT , d1mode_priority_a_cnt); -WREG32 (D2MODE_PRIORITY_A_CNT , d2mode_priority_a_cnt); -WREG32 (D2MODE_PRIORITY_B_CNT , d2mode_priority_a_cnt); }else if (mode0) {if (dfixed_trunc (wm0.dbpp) >64 ) a.full =dfixed_div (wm0.dbpp, wm0.num_line_pair);
@@ -1032,11 +1030,7 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev) d1mode_priority_a_cnt =dfixed_trunc (priority_mark02);if (rdev->disp_priority ==2 ) d1mode_priority_a_cnt |=MODE_PRIORITY_ALWAYS_ON ; -WREG32 (D1MODE_PRIORITY_A_CNT , d1mode_priority_a_cnt); -WREG32 (D1MODE_PRIORITY_B_CNT , d1mode_priority_a_cnt); -WREG32 (D2MODE_PRIORITY_A_CNT ,MODE_PRIORITY_OFF ); -WREG32 (D2MODE_PRIORITY_B_CNT ,MODE_PRIORITY_OFF ); - }else { + }else if (mode1) {if (dfixed_trunc (wm1.dbpp) >64 ) a.full =dfixed_div (wm1.dbpp, wm1.num_line_pair);else
@@ -1065,11 +1059,12 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev) d2mode_priority_a_cnt =dfixed_trunc (priority_mark12);if (rdev->disp_priority ==2 ) d2mode_priority_a_cnt |=MODE_PRIORITY_ALWAYS_ON ; -WREG32 (D1MODE_PRIORITY_A_CNT ,MODE_PRIORITY_OFF ); -WREG32 (D1MODE_PRIORITY_B_CNT ,MODE_PRIORITY_OFF ); -WREG32 (D2MODE_PRIORITY_A_CNT , d2mode_priority_a_cnt); -WREG32 (D2MODE_PRIORITY_B_CNT , d2mode_priority_a_cnt); } + +WREG32 (D1MODE_PRIORITY_A_CNT , d1mode_priority_a_cnt); +WREG32 (D1MODE_PRIORITY_B_CNT , d1mode_priority_a_cnt); +WREG32 (D2MODE_PRIORITY_A_CNT , d2mode_priority_a_cnt); +WREG32 (D2MODE_PRIORITY_B_CNT , d2mode_priority_a_cnt); }void rv515_bandwidth_update (struct radeon_device *rdev)
drivers/gpu/drm/radeon/rv770.c +4 -1
@@ -189,7 +189,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
@@ -308,7 +308,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
@@ -3419,13 +3419,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
@@ -630,9 +630,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:
@@ -996,7 +993,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/ar9002_calib.c +1 -1
@@ -239,7 +239,7 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)if (qCoff >15 ) qCoff =15 ;else if (qCoff <=-16 ) - qCoff =16 ; + qCoff =-16 ; ath_print(common, ATH_DBG_CALIBRATE, "Chn %d : iCoff = 0x%x qCoff = 0x%x\n",
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +1 -1
@@ -944,7 +944,7 @@ static u8 ath9k_hw_ar9300_get_num_ant_config(struct ath_hw *ah,return 1 ; } -static u16 ath9k_hw_ar9300_get_eeprom_antenna_cfg (struct ath_hw *ah, +static u32 ath9k_hw_ar9300_get_eeprom_antenna_cfg (struct ath_hw *ah,struct ath9k_channel *chan) {return -EINVAL ;
drivers/net/wireless/ath/ath9k/eeprom.h +1 -1
@@ -669,7 +669,7 @@ struct eeprom_ops {int (*get_eeprom_ver)(struct ath_hw *hw);int (*get_eeprom_rev)(struct ath_hw *hw);u8 (*get_num_ant_config)(struct ath_hw *hw,enum ieee80211_band band); -u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw, +u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,struct ath9k_channel *chan);void (*set_board_values)(struct ath_hw *hw,struct ath9k_channel *chan);void (*set_addac)(struct ath_hw *hw,struct ath9k_channel *chan);
drivers/net/wireless/ath/ath9k/eeprom_4k.c +2 -2
@@ -1149,13 +1149,13 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah, } } -static u16 ath9k_hw_4k_get_eeprom_antenna_cfg (struct ath_hw *ah, +static u32 ath9k_hw_4k_get_eeprom_antenna_cfg (struct ath_hw *ah,struct ath9k_channel *chan) {struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;struct modal_eep_4k_header *pModal = &eep->modalHeader; -return pModal->antCtrlCommon &0xFFFF ; +return pModal->antCtrlCommon; } static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/eeprom_9287.c +2 -2
@@ -1131,13 +1131,13 @@ static u8 ath9k_hw_AR9287_get_num_ant_config(struct ath_hw *ah,return 1 ; } -static u16 ath9k_hw_AR9287_get_eeprom_antenna_cfg (struct ath_hw *ah, +static u32 ath9k_hw_AR9287_get_eeprom_antenna_cfg (struct ath_hw *ah,struct ath9k_channel *chan) {struct ar9287_eeprom *eep = &ah->eeprom.map9287;struct modal_eep_ar9287_header *pModal = &eep->modalHeader; -return pModal->antCtrlCommon &0xFFFF ; +return pModal->antCtrlCommon; } static u16 ath9k_hw_AR9287_get_spur_channel(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/eeprom_def.c +3 -3
@@ -729,7 +729,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] +
@@ -1437,14 +1437,14 @@ static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah,return num_ant_config; } -static u16 ath9k_hw_def_get_eeprom_antenna_cfg (struct ath_hw *ah, +static u32 ath9k_hw_def_get_eeprom_antenna_cfg (struct ath_hw *ah,struct ath9k_channel *chan) {struct ar5416_eeprom_def *eep = &ah->eeprom.def;struct modal_eep_header *pModal = &(eep->modalHeader[IS_CHAN_2GHZ (chan)]); -return pModal->antCtrlCommon &0xFFFF ; +return pModal->antCtrlCommon; }static u16 ath9k_hw_def_get_spur_channel (struct ath_hw *ah,u16 i,bool is2GHz)
drivers/net/wireless/ath/ath9k/hw.c +19 -4
@@ -537,7 +537,8 @@ static 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 {
@@ -1232,9 +1233,11 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,if (!ah->chip_fullsleep) {ath9k_hw_abortpcurecv (ah); -if (!ath9k_hw_stopdmarecv (ah)) +if (!ath9k_hw_stopdmarecv (ah)) {ath_print (common,ATH_DBG_XMIT ,"Failed to stop receive dma\n" ); + bChannelChange = false; + } }if (!ath9k_hw_setpower (ah,ATH9K_PM_AWAKE ))
@@ -1265,7 +1268,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) &
@@ -1297,7 +1301,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))
@@ -1307,6 +1311,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 +58 -37
166 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-scan.c +8 -10
@@ -420,11 +420,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);
@@ -489,12 +488,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/net/xen-netfront.c +1 -0
@@ -1621,6 +1621,7 @@ static void backend_changed(struct xenbus_device *dev,if (xennet_connect (netdev) !=0 )break ;xenbus_switch_state (dev, XenbusStateConnected); +netif_notify_peers (netdev);break ;case XenbusStateClosing:
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.c +1 -0
@@ -235,6 +235,7 @@ void ssb_chipcommon_init(struct ssb_chipcommon *cc)return ;/* We don't have a ChipCommon */ if (cc->dev->id.revision >=11 ) cc->status =chipco_read32 (cc,SSB_CHIPCO_CHIPSTAT ); + ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);ssb_pmu_init (cc);chipco_powercontrol_init (cc);ssb_chipco_set_clockmode (cc,SSB_CLKMODE_FAST );
drivers/ssb/pci.c +13 -2
@@ -626,11 +626,22 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,return -ENODEV ; }if (bus->chipco.dev) {/* can be unavailible! */ - bus->sprom_offset = (bus->chipco.dev->id.revision <31 ) ? -SSB_SPROM_BASE1 :SSB_SPROM_BASE31 ; +/* +* get SPROM offset: SSB_SPROM_BASE1 except for +* chipcommon rev >= 31 or chip ID is 0x4312 and +* chipcommon status & 3 == 2 +*/ +if (bus->chipco.dev->id.revision >=31 ) + bus->sprom_offset =SSB_SPROM_BASE31 ; +else if (bus->chip_id ==0x4312 && + (bus->chipco.status &0x03 ) ==2 ) + bus->sprom_offset =SSB_SPROM_BASE31 ; +else + bus->sprom_offset =SSB_SPROM_BASE1 ; }else { bus->sprom_offset =SSB_SPROM_BASE1 ; } + ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset); buf =kcalloc (SSB_SPROMSIZE_WORDS_R123 ,sizeof (u16),GFP_KERNEL );if (!buf)
fs/block_dev.c +2 -2
@@ -681,8 +681,8 @@ retry:if (!bd_may_claim (bdev, whole, holder))return -EBUSY ; -/* if someone else is claiming, wait for it to finish */ -if (whole->bd_claiming && whole->bd_claiming != holder) { +/* if claiming is already in progress, wait for it to finish */ +if (whole->bd_claiming) {wait_queue_head_t *wq =bit_waitqueue (&whole->bd_claiming,0 );DEFINE_WAIT (wait);
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/netdevice.h +2 -0
@@ -1775,6 +1775,8 @@ extern void netif_carrier_on(struct net_device *dev);extern void netif_carrier_off (struct net_device *dev); +extern void netif_notify_peers (struct net_device *dev); +/** * netif_dormant_on - mark device as dormant. * @dev: network device
include/linux/notifier.h +1 -0
@@ -210,6 +210,7 @@ static inline int notifier_to_errno(int ret)#define NETDEV_POST_INIT 0x0010#define NETDEV_UNREGISTER_BATCH 0x0011#define NETDEV_BONDING_DESLAVE 0x0012 +#define NETDEV_NOTIFY_PEERS 0x0012#define SYS_DOWN 0x0001/* Notify of system down */ #define SYS_RESTART SYS_DOWN
kernel/signal.c +6 -3
@@ -637,7 +637,7 @@ static inline bool si_fromuser(const struct siginfo *info)/* * Bad permissions for sending the signal -* - the caller must hold at least the RCU read lock +* - the caller must hold the RCU read lock */ static int check_kill_permission (int sig,struct siginfo *info,struct task_struct *t)
@@ -1127,11 +1127,14 @@ struct sighand_struct *lock_task_sighand(struct task_struct *tsk, unsigned long/* * send signal info to all the members of a group -* - the caller must hold the RCU read lock at least */ int group_send_sig_info (int sig,struct siginfo *info,struct task_struct *p) { -int ret =check_kill_permission (sig, info, p); +int ret; + +rcu_read_lock (); + ret =check_kill_permission (sig, info, p); +rcu_read_unlock ();if (!ret && sig) ret =do_send_sig_info (sig, info, p, true);
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/ipv4/devinet.c +1 -0
@@ -1081,6 +1081,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, }ip_mc_up (in_dev);/* fall through */ +case NETDEV_NOTIFY_PEERS :case NETDEV_CHANGEADDR :/* Send gratuitous ARP to notify of link change */ if (IN_DEV_ARP_NOTIFY (in_dev)) {
net/mac80211/mesh_plink.c +31 -11
122 lines not on this page · raw message
net/sched/sch_generic.c +18 -0
@@ -327,6 +327,24 @@ void netif_carrier_off(struct net_device *dev) }EXPORT_SYMBOL (netif_carrier_off); +/** +* netif_notify_peers - notify network peers about existence of @dev +* @dev: network device +* +* Generate traffic such that interested network peers are aware of +* @dev, such as by generating a gratuitous ARP. This may be used when +* a device wants to inform the rest of the network about some sort of +* reconfiguration such as a failover event or virtual machine +* migration. +*/ +void netif_notify_peers (struct net_device *dev) +{ +rtnl_lock (); +call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , dev); +rtnl_unlock (); +} +EXPORT_SYMBOL (netif_notify_peers); +/* "NOOP" scheduler: the best scheduler, recommended for all interfaces under all circumstances. It is difficult to invent anything faster or cheaper.
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);