Linux 3.0.34
Greg KH
maintainerI'm announcing the release of the 3.0.34 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/parisc/kernel/entry.S | 30 +++++++------ arch/parisc/kernel/vmlinux.lds.S | 6 +- arch/x86/include/asm/pgtable-3level.h | 50 ++++++++++++++++++++++ drivers/acpi/battery.c | 10 +++- drivers/atm/solos-pci.c | 4 + drivers/bluetooth/ath3k.c | 6 ++ drivers/bluetooth/btusb.c | 16 ++++++- drivers/gpu/drm/i915/intel_sdvo.c | 12 +++-- drivers/gpu/drm/i915/intel_sdvo_regs.h | 5 ++ drivers/gpu/drm/i915/intel_tv.c | 5 ++ drivers/gpu/drm/radeon/evergreen.c | 9 +++ drivers/gpu/drm/radeon/evergreend.h | 1 drivers/gpu/drm/radeon/radeon_atombios.c | 4 + drivers/gpu/drm/radeon/rv770.c | 2 drivers/gpu/drm/radeon/rv770d.h | 1 drivers/gpu/drm/ttm/ttm_bo.c | 1 drivers/mtd/nand/nand_bbt.c | 1 drivers/net/macvlan.c | 2 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 drivers/net/wireless/wl1251/sdio.c | 2 drivers/net/wireless/wl1251/spi.c | 3 - drivers/scsi/scsi_lib.c | 11 +++- drivers/scsi/scsi_wait_scan.c | 2 fs/cifs/cifsglob.h | 1 fs/cifs/file.c | 57 ++++++++++++++----------- fs/ext4/ioctl.c | 13 +++-- fs/ext4/mballoc.c | 6 +- fs/ext4/super.c | 4 + fs/namespace.c | 3 - fs/nfs/nfs4proc.c | 2 include/asm-generic/pgtable.h | 22 ++++++++- include/drm/drm_pciids.h | 2 include/linux/netdevice.h | 9 --- include/linux/skbuff.h | 2 include/net/dst.h | 1 include/net/sctp/sctp.h | 13 +++++ mm/vmscan.c | 2 net/8021q/vlan_dev.c | 2 net/core/dev.c | 36 ++------------- net/core/pktgen.c | 10 +++- net/ipv4/esp4.c | 24 +++------- net/ipv4/fib_semantics.c | 20 +++++--- net/ipv4/fib_trie.c | 2 net/ipv6/esp6.c | 18 +++---- net/ipv6/ip6_output.c | 68 ++++++++++++++++++++++-------- net/l2tp/l2tp_ip.c | 30 ++++++++++--- net/mac80211/util.c | 12 ++--- net/sctp/output.c | 4 - net/sctp/transport.c | 17 ------- net/xfrm/xfrm_policy.c | 3 + sound/usb/pcm.c | 3 + 52 files changed, 374 insertions(+), 198 deletions(-)
Al Viro (1):
vfs: umount_tree() might be called on subtree that had never made it
Alex Deucher (3):
drm/radeon: fix XFX quirk
drm/radeon: properly program gart on rv740, juniper, cypress, barts, hemlock drm/radeon/kms: add new BTC PCI ids
Andrea Arcangeli (1):
mm: pmd_read_atomic: fix 32bit PAE pmd walk vs pmd_populate SMP race condition
Andy Whitcroft (1):
ACPI battery: only refresh the sysfs files when pertinent information changes
Benjamin Poirier (1):
xfrm: take net hdr len into account for esp payload size calculation
Clemens Ladisch (1):
ALSA: usb-audio: fix rate_list memory leak
Daniel Vetter (2):
drm/i915: properly handle interlaced bit for sdvo dtd conversion drm/i915: wait for a vblank to pass after tv detect
David S. Miller (2):
ipv4: Do not use dead fib_info entries.
Revert "net: maintain namespace isolation between vlan and real device"
David Woodhouse (1):
solos-pci: Fix DMA support
Dmitry Maluka (1):
mtd: nand: fix scan_read_raw_oob
Don Zickus (1):
Bluetooth: btusb: typo in Broadcom SoftSailing id
Eric Dumazet (2):
pktgen: fix crash at module unload
pktgen: fix module unload for good
Eric Sandeen (1):
ext4: force ro mount if ext4_setup_super() fails
Eyal Shapira (1):
mac80211: fix ADDBA declined after suspend with wowlan
Felix Fietkau (1):
skb: avoid unnecessary reallocations in __skb_cow
Gao feng (1):
ipv6: fix incorrect ipsec fragment
Grazvydas Ignotas (1):
wl1251: fix oops on early interrupt
Greg Kroah-Hartman (1):
Linux 3.0.34
James Bottomley (2):
SCSI: fix scsi_wait_scan
PARISC: fix TLB fault path on PA2.0 narrow systems
James Chapman (1):
l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
James M. Leddy (1):
Bluetooth: btusb: add support for BCM20702A0 [0a5c:21e6]
Jerome Glisse (1):
drm/radeon: fix HD6790, HD6570 backend programming
Jesse Sung (1):
Bluetooth: Add support for BCM20702A0 [0a5c:21e3]
John David Anglin (1):
PARISC: fix boot failure on 32-bit systems caused by branch stubs placed before .text
João Paulo Rechi Vita (1):
Bluetooth: btusb: Add USB device ID "0a5c 21e8"
Jun'ichi Nomura (1):
SCSI: Fix dm-multipath starvation when scsi host is busy
Manoj Iyer (2):
Bluetooth: btusb: Add vendor specific ID (0a5c 21f3) for BCM20702A0
Bluetooth: btusb: Add vendor specific ID (0489 e042) for BCM20702A0
Meenakshi Venkataraman (1):
iwlwifi: update BT traffic load states correctly
Michael Gruetzner (1):
Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C
Michal Hocko (1):
mm: consider all swapped back pages in used-once logic
Nicolas Dichtel (1):
sctp: check cached dst before using it
Salman Qazi (2):
ext4: add ext4_mb_unload_buddy in the error path
ext4: remove mb_groups before tearing down the buddy_cache
Shirish Pargaonkar (1):
cifs: fix oops while traversing open file list (try #4)
Steven Harms (1):
Add Foxconn / Hon Hai IDs for btusb module
Tao Ma (1):
ext4: don't set i_flags in EXT4_IOC_SETFLAGS
Theodore Ts'o (2):
ext4: add missing save_error_info() to ext4_error()
ext4: don't trash state flags in EXT4_IOC_SETFLAGS
Thomas Hellstrom (1):
drm/ttm: Fix spinlock imbalance
Trond Myklebust (1):
NFSv4: Map NFS4ERR_SHARE_DENIED into an EACCES error instead of EIO
Wen-chien Jesse Sung (1):
Bluetooth: Add support for Broadcom BCM20702A0
Yanmin Zhang (1):
ipv4: fix the rcu race between free_fib_info and ip_route_output_slow
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 33 +SUBLEVEL = 34 EXTRAVERSION = NAME = Sneaky Weasel
arch/parisc/kernel/entry.S +17 -13
@@ -552,7 +552,7 @@ * entry (identifying the physical page) and %r23 up with * the from tlb entry (or nothing if only a to entry---for * clear_user_page_asm) */ - .macro do_alias spc,tmp,tmp1,va,pte,prot,fault + .macro do_alias spc,tmp,tmp1,va,pte,prot,fault,patype cmpib,COND(<>),n 0,\spc,\fault ldil L%(TMPALIAS_MAP_START),\tmp #if defined(CONFIG_64BIT) && (TMPALIAS_MAP_START >= 0x80000000)
@@ -581,11 +581,15 @@ */ cmpiclr,= 0x01,\tmp,%r0 ldi (_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot -#ifdef CONFIG_64BIT +.ifc \patype,20 depd,z \prot,8,7,\prot -#else +.else +.ifc \patype,11 depw,z \prot,8,7,\prot -#endif +.else + .error "undefined PA type to do_alias" +.endif +.endif /* * OK, it is in the temp alias region, check whether "from" or "to". * Check "subtle" note in pacache.S re: r23/r26.
@@ -1189,7 +1193,7 @@ dtlb_miss_20w: nop dtlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20 idtlbt pte,prot
@@ -1213,7 +1217,7 @@ nadtlb_miss_20w: nop nadtlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20 idtlbt pte,prot
@@ -1245,7 +1249,7 @@ dtlb_miss_11: nop dtlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,11 idtlba pte,(va) idtlbp prot,(va)
@@ -1277,7 +1281,7 @@ nadtlb_miss_11: nop nadtlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,11 idtlba pte,(va) idtlbp prot,(va)
@@ -1304,7 +1308,7 @@ dtlb_miss_20: nop dtlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20 idtlbt pte,prot
@@ -1330,7 +1334,7 @@ nadtlb_miss_20: nop nadtlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20 idtlbt pte,prot
@@ -1457,7 +1461,7 @@ naitlb_miss_20w: nop naitlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,naitlb_fault + do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20 iitlbt pte,prot
@@ -1511,7 +1515,7 @@ naitlb_miss_11: nop naitlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,itlb_fault + do_alias spc,t0,t1,va,pte,prot,itlb_fault,11 iitlba pte,(%sr0, va) iitlbp prot,(%sr0, va)
@@ -1557,7 +1561,7 @@ naitlb_miss_20: nop naitlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,naitlb_fault + do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20 iitlbt pte,prot
arch/parisc/kernel/vmlinux.lds.S +4 -2
@@ -50,8 +50,10 @@ SECTIONS . = KERNEL_BINARY_TEXT_START; _text = .; /* Text and read-only data */ - .text ALIGN(16) : { + .head ALIGN(16) : { HEAD_TEXT + } = 0 + .text ALIGN(16) : { TEXT_TEXT SCHED_TEXT LOCK_TEXT
@@ -65,7 +67,7 @@ SECTIONS *(.fixup) *(.lock.text) /* out-of-line lock text */ *(.gnu.warning) - } = 0 + } /* End of text section */ _etext = .;
arch/x86/include/asm/pgtable-3level.h +50 -0
56 lines not on this page · raw message
drivers/acpi/battery.c +9 -1
@@ -635,11 +635,19 @@ static int acpi_battery_update(struct acpi_battery *battery)static void acpi_battery_refresh (struct acpi_battery *battery) { +int power_unit; +if (!battery->bat.dev)return ; + power_unit = battery->power_unit; +acpi_battery_get_info (battery); -/* The battery may have changed its reporting units. */ + +if (power_unit == battery->power_unit) +return ; + +/* The battery has changed its reporting units. */ sysfs_remove_battery (battery);sysfs_add_battery (battery); }
drivers/atm/solos-pci.c +3 -1
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card) }else if (skb && card->using_dma) {SKB_CB (skb)->dma_addr =pci_map_single (card->dev, skb->data, skb->len,PCI_DMA_TODEVICE ); + card->tx_skb[port] = skb;iowrite32 (SKB_CB (skb)->dma_addr, card->config_regs +TX_DMA_ADDR (port)); }
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) db_fpga_upgrade = db_firmware_upgrade =0 ; } -if (card->fpga_version >=DMA_SUPPORTED ){ +if (card->fpga_version >=DMA_SUPPORTED ) { +pci_set_master (dev); card->using_dma =1 ; }else { card->using_dma =0 ;
drivers/bluetooth/ath3k.c +6 -0
@@ -78,6 +78,9 @@ static struct usb_device_id ath3k_table[] = {/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) }, +/* Atheros AR5BBU22 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE03C) }, + { } /* Terminating entry */ };
@@ -94,6 +97,9 @@ static struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, + /* Atheros AR5BBU22 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, + { } /* Terminating entry */ };
drivers/bluetooth/btusb.c +15 -1
@@ -61,7 +61,7 @@ static struct usb_device_id btusb_table[] = { { USB_DEVICE_INFO(0xe0, 0x01, 0x01) },/* Broadcom SoftSailing reporting vendor specific */ - { USB_DEVICE(0x05ac, 0x21e1) }, + { USB_DEVICE(0x0a5c, 0x21e1) },/* Apple MacBookPro 7,1 */ { USB_DEVICE(0x05ac, 0x8213) },
@@ -100,6 +100,17 @@ static struct usb_device_id btusb_table[] = {/* Canyon CN-BTU1 with HID interfaces */ { USB_DEVICE(0x0c10, 0x0000) }, +/* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0489, 0xe042) }, + { USB_DEVICE(0x0a5c, 0x21e3) }, + { USB_DEVICE(0x0a5c, 0x21e6) }, + { USB_DEVICE(0x0a5c, 0x21e8) }, + { USB_DEVICE(0x0a5c, 0x21f3) }, + { USB_DEVICE(0x413c, 0x8197) }, + +/* Foxconn - Hon Hai */ + { USB_DEVICE(0x0489, 0xe033) }, + { } /* Terminating entry */ };
@@ -130,6 +141,9 @@ static struct usb_device_id blacklist_table[] = {/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, + /* Atheros AR5BBU12 with sflash firmware */ + { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 }, + /* Broadcom BCM2035 */ { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU }, { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
drivers/gpu/drm/i915/intel_sdvo.c +8 -4
@@ -762,10 +762,12 @@ static void intel_sdvo_get_dtd_from_mode(struct intel_sdvo_dtd *dtd, ((v_sync_len &0x30 ) >>4 ); dtd->part2.dtd_flags =0x18 ; +if (mode->flags &DRM_MODE_FLAG_INTERLACE ) + dtd->part2.dtd_flags |=DTD_FLAG_INTERLACE ;if (mode->flags &DRM_MODE_FLAG_PHSYNC ) - dtd->part2.dtd_flags |=0x2 ; + dtd->part2.dtd_flags |=DTD_FLAG_HSYNC_POSITIVE ;if (mode->flags &DRM_MODE_FLAG_PVSYNC ) - dtd->part2.dtd_flags |=0x4 ; + dtd->part2.dtd_flags |=DTD_FLAG_VSYNC_POSITIVE ; dtd->part2.sdvo_flags =0 ; dtd->part2.v_sync_off_high = v_sync_offset &0xc0 ;
@@ -799,9 +801,11 @@ static void intel_sdvo_get_mode_from_dtd(struct drm_display_mode * mode, mode->clock = dtd->part1.clock *10 ; mode->flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ); -if (dtd->part2.dtd_flags &0x2 ) +if (dtd->part2.dtd_flags &DTD_FLAG_INTERLACE ) + mode->flags |=DRM_MODE_FLAG_INTERLACE ; +if (dtd->part2.dtd_flags &DTD_FLAG_HSYNC_POSITIVE ) mode->flags |=DRM_MODE_FLAG_PHSYNC ; -if (dtd->part2.dtd_flags &0x4 ) +if (dtd->part2.dtd_flags &DTD_FLAG_VSYNC_POSITIVE ) mode->flags |=DRM_MODE_FLAG_PVSYNC ; }
drivers/gpu/drm/i915/intel_sdvo_regs.h +5 -0
@@ -61,6 +61,11 @@ struct intel_sdvo_caps {u16 output_flags; } __attribute__((packed)); +/* Note: SDVO detailed timing flags match EDID misc flags. */ +#define DTD_FLAG_HSYNC_POSITIVE (1 << 1) +#define DTD_FLAG_VSYNC_POSITIVE (1 << 2) +#define DTD_FLAG_INTERLACE (1 << 7) +/** This matches the EDID DTD structure, more or less */ struct intel_sdvo_dtd { struct {
drivers/gpu/drm/i915/intel_tv.c +5 -0
@@ -1301,6 +1301,11 @@ intel_tv_detect_type (struct intel_tv *intel_tv,I915_WRITE (TV_DAC , save_tv_dac & ~TVDAC_STATE_CHG_EN );I915_WRITE (TV_CTL , save_tv_ctl); +POSTING_READ (TV_CTL ); + +/* For unknown reasons the hw barfs if we don't do this vblank wait. */ +intel_wait_for_vblank (intel_tv->base.base.dev, +to_intel_crtc (intel_tv->base.base.crtc)->pipe);/* Restore interrupt config */ if (connector->polled &DRM_CONNECTOR_POLL_HPD ) {
drivers/gpu/drm/radeon/evergreen.c +7 -2
@@ -926,6 +926,11 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev)WREG32 (MC_VM_MD_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB1_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB2_CNTL , tmp); +if ((rdev->family ==CHIP_JUNIPER ) || + (rdev->family ==CHIP_CYPRESS ) || + (rdev->family ==CHIP_HEMLOCK ) || + (rdev->family ==CHIP_BARTS )) +WREG32 (MC_VM_MD_L1_TLB3_CNTL , tmp); }WREG32 (MC_VM_MB_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB1_CNTL , tmp);
@@ -2064,9 +2069,9 @@ static void evergreen_gpu_init(struct radeon_device *rdev)WREG32 (CC_SYS_RB_BACKEND_DISABLE , rb);WREG32 (GC_USER_RB_BACKEND_DISABLE , rb);WREG32 (CC_GC_SHADER_PIPE_CONFIG , sp); - } + } - grbm_gfx_index |=SE_BROADCAST_WRITES ; + grbm_gfx_index =INSTANCE_BROADCAST_WRITES |SE_BROADCAST_WRITES ;WREG32 (GRBM_GFX_INDEX , grbm_gfx_index);WREG32 (RLC_GFX_INDEX , grbm_gfx_index);
drivers/gpu/drm/radeon/evergreend.h +1 -0
@@ -230,6 +230,7 @@#define MC_VM_MD_L1_TLB0_CNTL 0x2654#define MC_VM_MD_L1_TLB1_CNTL 0x2658#define MC_VM_MD_L1_TLB2_CNTL 0x265C +#define MC_VM_MD_L1_TLB3_CNTL 0x2698#define FUS_MC_VM_MD_L1_TLB0_CNTL 0x265C#define FUS_MC_VM_MD_L1_TLB1_CNTL 0x2660
drivers/gpu/drm/radeon/radeon_atombios.c +3 -1
@@ -480,7 +480,9 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,*/ if ((dev->pdev->device ==0x9498 ) && (dev->pdev->subsystem_vendor ==0x1682 ) && - (dev->pdev->subsystem_device ==0x2452 )) { + (dev->pdev->subsystem_device ==0x2452 ) && + (i2c_bus->valid == false) && + !(supported_device & (ATOM_DEVICE_TV_SUPPORT |ATOM_DEVICE_CV_SUPPORT ))) {struct radeon_device *rdev = dev->dev_private; *i2c_bus =radeon_lookup_i2c_gpio (rdev,0x93 ); }
drivers/gpu/drm/radeon/rv770.c +2 -0
@@ -151,6 +151,8 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev)WREG32 (MC_VM_MD_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB1_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB2_CNTL , tmp); +if (rdev->family ==CHIP_RV740 ) +WREG32 (MC_VM_MD_L1_TLB3_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB1_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB2_CNTL , tmp);
drivers/gpu/drm/radeon/rv770d.h +1 -0
@@ -174,6 +174,7 @@#define MC_VM_MD_L1_TLB0_CNTL 0x2654#define MC_VM_MD_L1_TLB1_CNTL 0x2658#define MC_VM_MD_L1_TLB2_CNTL 0x265C +#define MC_VM_MD_L1_TLB3_CNTL 0x2698#define MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR 0x203C#define MC_VM_SYSTEM_APERTURE_HIGH_ADDR 0x2038#define MC_VM_SYSTEM_APERTURE_LOW_ADDR 0x2034
drivers/gpu/drm/ttm/ttm_bo.c +1 -0
@@ -1809,6 +1809,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)spin_unlock (&glob->lru_lock); (void )ttm_bo_cleanup_refs (bo, false, false, false);kref_put (&bo->list_kref, ttm_bo_release_list); +spin_lock (&glob->lru_lock);continue ; }
drivers/mtd/nand/nand_bbt.c +1 -0
@@ -360,6 +360,7 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs, buf += mtd->oobsize + mtd->writesize; len -= mtd->writesize; + offs += mtd->writesize; }return 0 ; }
drivers/net/macvlan.c +1 -1
@@ -247,7 +247,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) xmit_world: skb->ip_summed = ip_summed; -skb_set_dev (skb, vlan->lowerdev); + skb->dev = vlan->lowerdev;return dev_queue_xmit (skb); }
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +1 -0
@@ -878,6 +878,7 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,if ((priv->bt_traffic_load != priv->last_bt_traffic_load) || (priv->bt_full_concurrent != full_concurrent)) { priv->bt_full_concurrent = full_concurrent; + priv->last_bt_traffic_load = priv->bt_traffic_load;/* Update uCode's rate table. */ tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
drivers/net/wireless/wl1251/sdio.c +1 -1
@@ -259,6 +259,7 @@ static int wl1251_sdio_probe(struct sdio_func *func, }if (wl->irq) { +irq_set_status_flags (wl->irq,IRQ_NOAUTOEN ); ret =request_irq (wl->irq, wl1251_line_irq,0 ,"wl1251" , wl);if (ret <0 ) {wl1251_error ("request_irq() failed: %d" , ret);
@@ -266,7 +267,6 @@ static int wl1251_sdio_probe(struct sdio_func *func, }irq_set_irq_type (wl->irq,IRQ_TYPE_EDGE_RISING ); -disable_irq (wl->irq); wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq; wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
drivers/net/wireless/wl1251/spi.c +1 -2
@@ -280,6 +280,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi) wl->use_eeprom = pdata->use_eeprom; +irq_set_status_flags (wl->irq,IRQ_NOAUTOEN ); ret =request_irq (wl->irq, wl1251_irq,0 ,DRIVER_NAME , wl);if (ret <0 ) {wl1251_error ("request_irq() failed: %d" , ret);
@@ -288,8 +289,6 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)irq_set_irq_type (wl->irq,IRQ_TYPE_EDGE_RISING ); -disable_irq (wl->irq); - ret =wl1251_init_ieee80211 (wl);if (ret) goto out_irq;
drivers/scsi/scsi_lib.c +7 -4
@@ -1380,16 +1380,19 @@ static int scsi_lld_busy(struct request_queue *q) {struct scsi_device *sdev = q->queuedata;struct Scsi_Host *shost; -struct scsi_target *starget;if (!sdev)return 0 ; shost = sdev->host; - starget =scsi_target (sdev); -if (scsi_host_in_recovery (shost) ||scsi_host_is_busy (shost) || -scsi_target_is_busy (starget) ||scsi_device_is_busy (sdev)) +/* +* Ignore host/starget busy state. +* Since block layer does not have a concept of fairness across +* multiple queues, congestion of host/starget needs to be handled +* in SCSI layer. +*/ +if (scsi_host_in_recovery (shost) ||scsi_device_is_busy (sdev))return 1 ;return 0 ;
drivers/scsi/scsi_wait_scan.c +1 -1
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/device.h> -#include <scsi/scsi_scan.h> +#include "scsi_priv.h" static int __init wait_scan_init (void ) {
fs/cifs/cifsglob.h +1 -0
@@ -43,6 +43,7 @@#define CIFS_MIN_RCV_POOL 4 +#define MAX_REOPEN_ATT 5/* these many maximum attempts to reopen a file */ /* * default attribute cache timeout (jiffies) */
fs/cifs/file.c +33 -24
90 lines not on this page · raw message
fs/ext4/ioctl.c +9 -4
@@ -35,7 +35,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)handle_t *handle =NULL ;int err, migrate =0 ;struct ext4_iloc iloc; -unsigned int oldflags; +unsigned int oldflags, mask, i;unsigned int jflag;if (!inode_owner_or_capable (inode))
@@ -112,9 +112,14 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)if (err) goto flags_err; - flags = flags &EXT4_FL_USER_MODIFIABLE ; - flags |= oldflags & ~EXT4_FL_USER_MODIFIABLE ; - ei->i_flags = flags; +for (i =0 , mask =1 ; i <32 ; i++, mask <<=1 ) { +if (!(mask &EXT4_FL_USER_MODIFIABLE )) +continue ; +if (mask & flags) +ext4_set_inode_flag (inode, i); +else +ext4_clear_inode_flag (inode, i); + }ext4_set_inode_flags (inode); inode->i_ctime =ext4_current_time (inode);
fs/ext4/mballoc.c +4 -2
@@ -2528,6 +2528,9 @@ int ext4_mb_release(struct super_block *sb)struct ext4_sb_info *sbi =EXT4_SB (sb);struct kmem_cache *cachep =get_groupinfo_cache (sb->s_blocksize_bits); +if (sbi->s_proc) +remove_proc_entry ("mb_groups" , sbi->s_proc); +if (sbi->s_group_info) {for (i =0 ; i < ngroups; i++) { grinfo =ext4_get_group_info (sb, i);
@@ -2575,8 +2578,6 @@ int ext4_mb_release(struct super_block *sb) }free_percpu (sbi->s_locality_groups); -if (sbi->s_proc) -remove_proc_entry ("mb_groups" , sbi->s_proc);return 0 ; }
@@ -4583,6 +4584,7 @@ do_more:*/ new_entry =kmem_cache_alloc (ext4_free_ext_cachep,GFP_NOFS );if (!new_entry) { +ext4_mb_unload_buddy (&e4b); err = -ENOMEM ; goto error_return; }
fs/ext4/super.c +3 -1
@@ -433,6 +433,7 @@ void __ext4_error(struct super_block *sb, const char *function,printk (KERN_CRIT "EXT4-fs error (device %s): %s:%d: comm %s: %pV\n" , sb->s_id, function, line, current->comm, &vaf);va_end (args); +save_error_info (sb, function, line);ext4_handle_error (sb); }
@@ -3618,7 +3619,8 @@ no_journal: goto failed_mount4; } -ext4_setup_super (sb, es, sb->s_flags &MS_RDONLY ); +if (ext4_setup_super (sb, es, sb->s_flags &MS_RDONLY )) + sb->s_flags |=MS_RDONLY ;/* determine the minimum size of new large inodes, if present */ if (sbi->s_inode_size >EXT4_GOOD_OLD_INODE_SIZE ) {
fs/namespace.c +2 -1
@@ -1244,8 +1244,9 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill)list_del_init (&p->mnt_expire);list_del_init (&p->mnt_list);__touch_mnt_namespace (p->mnt_ns); +if (p->mnt_ns) +__mnt_make_shortterm (p); p->mnt_ns =NULL ; -__mnt_make_shortterm (p);list_del_init (&p->mnt_child);if (p->mnt_parent != p) { p->mnt_parent->mnt_ghosts++;
fs/nfs/nfs4proc.c +2 -0
@@ -94,6 +94,8 @@ static int nfs4_map_errors(int err)case -NFS4ERR_BADOWNER :case -NFS4ERR_BADNAME :return -EINVAL ; +case -NFS4ERR_SHARE_DENIED : +return -EACCES ;default :dprintk ("%s could not handle NFSv4 error %d\n" , __func__, -err);
include/asm-generic/pgtable.h +20 -2
@@ -445,6 +445,18 @@ static inline int pmd_write(pmd_t pmd)#endif /* __HAVE_ARCH_PMD_WRITE */ #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +#ifndef pmd_read_atomic +static inline pmd_t pmd_read_atomic (pmd_t *pmdp) +{ +/* +* Depend on compiler for an atomic pmd read. NOTE: this is +* only going to work, if the pmdval_t isn't larger than +* an unsigned long. +*/ +return *pmdp; +} +#endif +/* * This function is meant to be used by sites walking pagetables with * the mmap_sem hold in read mode to protect against MADV_DONTNEED and
@@ -458,11 +470,17 @@ static inline int pmd_write(pmd_t pmd)* undefined so behaving like if the pmd was none is safe (because it * can return none anyway). The compiler level barrier() is critically * important to compute the two checks atomically on the same pmdval. +* +* For 32bit kernels with a 64bit large pmd_t this automatically takes +* care of reading the pmd atomically to avoid SMP race conditions +* against pmd_populate() when the mmap_sem is hold for reading by the +* caller (a special atomic read not done by "gcc" as in the generic +* version above, is also needed when THP is disabled because the page +* fault can populate the pmd from under us). */ static inline int pmd_none_or_trans_huge_or_clear_bad (pmd_t *pmd) { -/* depend on compiler for an atomic pmd read */ -pmd_t pmdval = *pmd; +pmd_t pmdval =pmd_read_atomic (pmd);/* * The barrier will stabilize the pmdval in a register or on * the stack so that it will stop changing under the code.
include/drm/drm_pciids.h +2 -0
@@ -181,6 +181,7 @@ {0x1002, 0x6747, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6748, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x674A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6758, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
@@ -198,6 +199,7 @@ {0x1002, 0x6767, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6768, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6770, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6771, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
include/linux/netdevice.h +0 -9
@@ -1453,15 +1453,6 @@ static inline bool netdev_uses_dsa_tags(struct net_device *dev)return 0 ; } -#ifndef CONFIG_NET_NS -static inline void skb_set_dev (struct sk_buff *skb,struct net_device *dev) -{ - skb->dev = dev; -} -#else /* CONFIG_NET_NS */ -void skb_set_dev (struct sk_buff *skb,struct net_device *dev); -#endif -static inline bool netdev_uses_trailer_tags (struct net_device *dev) {#ifdef CONFIG_NET_DSA_TAG_TRAILER
include/linux/skbuff.h +0 -2
@@ -1633,8 +1633,6 @@ static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom, {int delta =0 ; -if (headroom <NET_SKB_PAD ) - headroom =NET_SKB_PAD ;if (headroom >skb_headroom (skb)) delta = headroom -skb_headroom (skb);
include/net/dst.h +1 -0
@@ -78,6 +78,7 @@ struct dst_entry {#define DST_NOHASH 0x0008#define DST_NOCACHE 0x0010#define DST_NOCOUNT 0x0020 +#define DST_XFRM_TUNNEL 0x0100union {struct dst_entry *next;struct rtable __rcu *rt_next;
include/net/sctp/sctp.h +13 -0
@@ -700,4 +700,17 @@ static inline void sctp_v4_map_v6(union sctp_addr *addr) addr->v6.sin6_addr.s6_addr32[2] = htonl(0x0000ffff); } +/* The cookie is always 0 since this is how it's used in the +* pmtu code. +*/ +static inline struct dst_entry *sctp_transport_dst_check (struct sctp_transport *t) +{ +if (t->dst && !dst_check (t->dst,0 )) { +dst_release (t->dst); + t->dst =NULL ; + } + +return t->dst; +} +#endif /* __net_sctp_h__ */
mm/vmscan.c +1 -1
@@ -665,7 +665,7 @@ static enum page_references page_check_references(struct page *page,return PAGEREF_RECLAIM ;if (referenced_ptes) { -if (PageAnon (page)) +if (PageSwapBacked (page))return PAGEREF_ACTIVATE ;/* * All mapped pages start out with page table
net/8021q/vlan_dev.c +1 -1
@@ -154,7 +154,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, skb =__vlan_hwaccel_put_tag (skb, vlan_tci); } -skb_set_dev (skb,vlan_dev_info (dev)->real_dev); + skb->dev =vlan_dev_info (dev)->real_dev; len = skb->len; ret =dev_queue_xmit (skb);
net/core/dev.c +5 -31
@@ -1533,10 +1533,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)kfree_skb (skb);return NET_RX_DROP ; } -skb_set_dev (skb, dev); + skb->dev = dev; +skb_dst_drop (skb); skb->tstamp.tv64 =0 ; skb->pkt_type =PACKET_HOST ; skb->protocol =eth_type_trans (skb, dev); + skb->mark =0 ; +secpath_reset (skb); +nf_reset (skb);return netif_rx (skb); }EXPORT_SYMBOL_GPL (dev_forward_skb);
@@ -1791,36 +1795,6 @@ void netif_device_attach(struct net_device *dev) }EXPORT_SYMBOL (netif_device_attach); -/** -* skb_dev_set -- assign a new device to a buffer -* @skb: buffer for the new device -* @dev: network device -* -* If an skb is owned by a device already, we have to reset -* all data private to the namespace a device belongs to -* before assigning it a new device. -*/ -#ifdef CONFIG_NET_NS -void skb_set_dev (struct sk_buff *skb,struct net_device *dev) -{ -skb_dst_drop (skb); -if (skb->dev && !net_eq (dev_net (skb->dev),dev_net (dev))) { -secpath_reset (skb); -nf_reset (skb); -skb_init_secmark (skb); - skb->mark =0 ; - skb->priority =0 ; - skb->nf_trace =0 ; - skb->ipvs_property =0 ; -#ifdef CONFIG_NET_SCHED - skb->tc_index =0 ; -#endif - } - skb->dev = dev; -} -EXPORT_SYMBOL (skb_set_dev); -#endif /* CONFIG_NET_NS */ -/* * Invalidate hardware checksum when packet is to be mangled, and * complete checksum manually on outgoing path.
net/core/pktgen.c +8 -2
@@ -1932,7 +1932,7 @@ static int pktgen_device_event(struct notifier_block *unused, {struct net_device *dev = ptr; -if (!net_eq (dev_net (dev), &init_net)) +if (!net_eq (dev_net (dev), &init_net) || pktgen_exiting)return NOTIFY_DONE ;/* It is OK that we do not hold the group lock right now,
@@ -3755,12 +3755,18 @@ static void __exit pg_cleanup(void) {struct pktgen_thread *t;struct list_head *q, *n; +LIST_HEAD (list);/* Stop all interfaces & threads */ pktgen_exiting = true; -list_for_each_safe (q, n, &pktgen_threads) { +mutex_lock (&pktgen_thread_lock); +list_splice_init (&pktgen_threads, &list); +mutex_unlock (&pktgen_thread_lock); + +list_for_each_safe (q, n, &list) { t = list_entry(q, struct pktgen_thread, th_list); +list_del (&t->th_list);kthread_stop (t->tsk);kfree (t); }
net/ipv4/esp4.c +9 -15
@@ -457,28 +457,22 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)struct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 );u32 align =max_t (u32, blksize, esp->padlen); -u32 rem; - - mtu -= x->props.header_len +crypto_aead_authsize (esp->aead); - rem = mtu & (align -1 ); - mtu &= ~(align -1 ); +unsigned int net_adj;switch (x->props.mode) { -case XFRM_MODE_TUNNEL : -break ; -default :case XFRM_MODE_TRANSPORT : -/* The worst case */ - mtu -= blksize -4 ; - mtu +=min_t (u32, blksize -4 , rem); -break ;case XFRM_MODE_BEET : -/* The worst case. */ - mtu +=min_t (u32,IPV4_BEET_PHMAXLEN , rem); + net_adj =sizeof (struct iphdr );break ; +case XFRM_MODE_TUNNEL : + net_adj =0 ; +break ; +default : +BUG (); } -return mtu -2 ; +return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - + net_adj) & ~(align -1 )) + (net_adj -2 ); }static void esp4_err (struct sk_buff *skb,u32 info)
net/ipv4/fib_semantics.c +13 -7
@@ -142,6 +142,18 @@ const struct fib_prop fib_props[RTN_MAX + 1] = { };/* Release a nexthop info record */ +static void free_fib_info_rcu (struct rcu_head *head) +{ + struct fib_info *fi = container_of(head, struct fib_info, rcu); + +change_nexthops (fi) { +if (nexthop_nh->nh_dev) +dev_put (nexthop_nh->nh_dev); + }endfor_nexthops (fi); + +release_net (fi->fib_net); +kfree (fi); +}void free_fib_info (struct fib_info *fi) {
@@ -149,14 +161,8 @@ void free_fib_info(struct fib_info *fi)pr_warning ("Freeing alive fib_info %p\n" , fi);return ; } -change_nexthops (fi) { -if (nexthop_nh->nh_dev) -dev_put (nexthop_nh->nh_dev); - nexthop_nh->nh_dev =NULL ; - }endfor_nexthops (fi); fib_info_cnt--; -release_net (fi->fib_net); -kfree_rcu (fi, rcu); +call_rcu (&fi->rcu, free_fib_info_rcu); }void fib_release_info (struct fib_info *fi)
net/ipv4/fib_trie.c +2 -0
@@ -1371,6 +1371,8 @@ static int check_leaf(struct fib_table *tb, struct trie *t, struct leaf *l,if (fa->fa_tos && fa->fa_tos != flp->flowi4_tos)continue ; +if (fi->fib_dead) +continue ;if (fa->fa_info->fib_scope < flp->flowi4_scope)continue ;fib_alias_accessed (fa);
net/ipv6/esp6.c +7 -11
@@ -411,19 +411,15 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)struct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 );u32 align =max_t (u32, blksize, esp->padlen); -u32 rem; +unsigned int net_adj; - mtu -= x->props.header_len +crypto_aead_authsize (esp->aead); - rem = mtu & (align -1 ); - mtu &= ~(align -1 ); - -if (x->props.mode !=XFRM_MODE_TUNNEL ) { -u32 padsize = ((blksize -1 ) &7 ) +1 ; - mtu -= blksize - padsize; - mtu +=min_t (u32, blksize - padsize, rem); - } +if (x->props.mode !=XFRM_MODE_TUNNEL ) + net_adj =sizeof (struct ipv6hdr ); +else + net_adj =0 ; -return mtu -2 ; +return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - + net_adj) & ~(align -1 )) + (net_adj -2 ); } static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
net/ipv6/ip6_output.c +50 -18
109 lines not on this page · raw message
net/l2tp/l2tp_ip.c +24 -6
@@ -251,9 +251,16 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) {struct inet_sock *inet =inet_sk (sk);struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *) uaddr; -int ret = -EINVAL ; +int ret;int chk_addr_ret; +if (!sock_flag (sk,SOCK_ZAPPED )) +return -EINVAL ; +if (addr_len <sizeof (struct sockaddr_l2tpip )) +return -EINVAL ; +if (addr->l2tp_family !=AF_INET ) +return -EINVAL ; + ret = -EADDRINUSE ;read_lock_bh (&l2tp_ip_lock);if (__l2tp_ip_bind_lookup (&init_net, addr->l2tp_addr.s_addr, sk->sk_bound_dev_if, addr->l2tp_conn_id))
@@ -283,6 +290,8 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)sk_del_node_init (sk);write_unlock_bh (&l2tp_ip_lock); ret =0 ; +sock_reset_flag (sk,SOCK_ZAPPED ); + out:release_sock (sk);
@@ -303,13 +312,14 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len__be32 saddr;int oif, rc; - rc = -EINVAL ; +if (sock_flag (sk,SOCK_ZAPPED ))/* Must bind first - autobinding does not work */ +return -EINVAL ; +if (addr_len <sizeof (*lsa)) - goto out; +return -EINVAL ; - rc = -EAFNOSUPPORT ;if (lsa->l2tp_family !=AF_INET ) - goto out; +return -EAFNOSUPPORT ;lock_sock (sk);
@@ -363,6 +373,14 @@ out:return rc; } +static int l2tp_ip_disconnect (struct sock *sk,int flags) +{ +if (sock_flag (sk,SOCK_ZAPPED )) +return 0 ; + +return udp_disconnect (sk, flags); +} +static int l2tp_ip_getname (struct socket *sock,struct sockaddr *uaddr,int *uaddr_len,int peer) {
@@ -591,7 +609,7 @@ static struct proto l2tp_ip_prot = { .close = l2tp_ip_close, .bind = l2tp_ip_bind, .connect = l2tp_ip_connect, - .disconnect = udp_disconnect, + .disconnect = l2tp_ip_disconnect, .ioctl = udp_ioctl, .destroy = l2tp_ip_destroy_sock, .setsockopt = ip_setsockopt,
net/mac80211/util.c +6 -6
@@ -1254,6 +1254,12 @@ int ieee80211_reconfig(struct ieee80211_local *local) } } +/* add back keys */ +list_for_each_entry (sdata, &local->interfaces, list) +if (ieee80211_sdata_running (sdata)) +ieee80211_enable_keys (sdata); + + wake_up:/* * Clear the WLAN_STA_BLOCK_BA flag so new aggregation * sessions can be established after a resume.
@@ -1275,12 +1281,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)mutex_unlock (&local->sta_mtx); } -/* add back keys */ -list_for_each_entry (sdata, &local->interfaces, list) -if (ieee80211_sdata_running (sdata)) -ieee80211_enable_keys (sdata); - - wake_up:ieee80211_wake_queues_by_reason (hw,IEEE80211_QUEUE_STOP_REASON_SUSPEND );
net/sctp/output.c +1 -3
@@ -377,9 +377,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)*/ skb_set_owner_w (nskb, sk); -/* The 'obsolete' field of dst is set to 2 when a dst is freed. */ -if (!dst || (dst->obsolete >1 )) { -dst_release (dst); +if (!sctp_transport_dst_check (tp)) {sctp_transport_route (tp,NULL ,sctp_sk (sk));if (asoc && (asoc->param_flags &SPP_PMTUD_ENABLE )) {sctp_assoc_sync_pmtu (asoc);
net/sctp/transport.c +0 -17
@@ -226,23 +226,6 @@ void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk) transport->pathmtu =SCTP_DEFAULT_MAXSEGMENT ; } -/* this is a complete rip-off from __sk_dst_check -* the cookie is always 0 since this is how it's used in the -* pmtu code -*/ -static struct dst_entry *sctp_transport_dst_check (struct sctp_transport *t) -{ -struct dst_entry *dst = t->dst; - -if (dst && dst->obsolete && dst->ops->check (dst,0 ) ==NULL ) { -dst_release (t->dst); - t->dst =NULL ; -return NULL ; - } - -return dst; -} -void sctp_transport_update_pmtu (struct sctp_transport *t,u32 pmtu) {struct dst_entry *dst;
net/xfrm/xfrm_policy.c +3 -0
@@ -1917,6 +1917,9 @@ no_transform: } ok:xfrm_pols_put (pols, drop_pols); +if (dst && dst->xfrm && + dst->xfrm->props.mode ==XFRM_MODE_TUNNEL ) + dst->flags |=DST_XFRM_TUNNEL ;return dst; nopol:
sound/usb/pcm.c +3 -0
@@ -670,6 +670,9 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,int count =0 , needs_knot =0 ;int err; +kfree (subs->rate_list.list); + subs->rate_list.list =NULL ; +list_for_each_entry (fp, &subs->fmt_list, list) {if (fp->rates &SNDRV_PCM_RATE_CONTINUOUS )return 0 ;