Linux 3.0.88
Greg KH
maintainerI'm announcing the release of the 3.0.88 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/sparc/kernel/asm-offsets.c | 2 + arch/sparc/mm/hypersparc.S | 8 +++---- arch/sparc/mm/init_64.c | 9 +++++++- arch/sparc/mm/swift.S | 8 +++---- arch/sparc/mm/tlb.c | 2 - arch/sparc/mm/tsunami.S | 6 ++--- arch/sparc/mm/viking.S | 10 ++++----- drivers/net/dummy.c | 4 +++ drivers/net/ifb.c | 9 +++++++- drivers/net/sunvnet.c | 2 + drivers/net/wireless/rt2x00/rt2800lib.c | 4 +-- drivers/net/wireless/rt2x00/rt61pci.c | 3 +- drivers/net/wireless/rt2x00/rt73usb.c | 3 +- drivers/s390/scsi/zfcp_aux.c | 5 +++- drivers/s390/scsi/zfcp_fsf.c | 25 ++++++++++++++++++------ drivers/scsi/bnx2fc/bnx2fc_io.c | 2 - drivers/scsi/megaraid/megaraid_sas_base.c | 10 +++++---- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 6 ----- drivers/usb/serial/cp210x.c | 4 +++ drivers/usb/serial/option.c | 23 ++++++++++++---------- fs/block_dev.c | 10 ++++++++- fs/lockd/svclock.c | 4 +++ include/linux/if_pppox.h | 4 +-- include/net/addrconf.h | 3 ++ include/net/udp.h | 1 kernel/events/core.c | 28 ++++++++++++++++++++++++--- kernel/hrtimer.c | 28 ++++++++++++--------------- kernel/time/tick-broadcast.c | 10 ++++++++- kernel/trace/trace.c | 10 ++++++++- kernel/trace/trace_syscalls.c | 18 +++++++++++++---- net/8021q/vlan_dev.c | 7 ++++++ net/bridge/br_multicast.c | 5 ++-- net/core/neighbour.c | 12 ++++++----- net/ipv4/udp.c | 3 +- net/ipv6/addrconf.c | 31 ++++++++++++++++++++---------- net/ipv6/ip6_output.c | 8 ++++++- net/ipv6/mcast.c | 18 +++++++++-------- net/ipv6/udp.c | 7 +++++- net/key/af_key.c | 2 + net/l2tp/l2tp_ppp.c | 3 +- net/x25/af_x25.c | 15 +++++++------- sound/soc/codecs/sgtl5000.h | 2 - sound/usb/6fire/pcm.c | 2 - 44 files changed, 262 insertions(+), 116 deletions(-)
Alexandr \\\"Sky\\\" Ivanov (1):
USB: option: add D-Link DWM-152/C1 and DWM-156/C1
Amerigo Wang (1):
ipv6,mcast: always hold idev->lock before mca_lock
Andi Kleen (1):
SCSI: Fix incorrect memset in bnx2fc_parse_fcp_rsp
Barry Grussling (1):
usb: cp210x support SEL C662 Vendor/Device
Bjørn Mork (2):
SCSI: megaraid_sas: fix memory leak if SGL has zero length entries
usb: option: add TP-LINK MA260
Changli Gao (1):
net: Swap ver and type in pppoe_hdr
Dan Williams (1):
usb: serial: option: add Olivetti Olicard 200
Daniel Hansel (1):
SCSI: zfcp: fix adapter (re)open recovery while link to SAN is down
Daniil Bolsun (1):
USB: option: append Petatel NP10T device to GSM modems list
Dave Jones (1):
x25: Fix broken locking in ioctl error paths.
Dave Kleikamp (2):
sparc: tsb must be flushed before tlb
sunvnet: vnet_port_remove must call unregister_netdev
David Jeffery (1):
lockd: protect nlm_blocked access in nlmsvc_retry_blocked
Eldad Zack (1):
ALSA: usb-audio: 6fire: return correct XRUN indication
Enrico Mioso (3):
usb: serial: option: blacklist ONDA MT689DC QMI interface
usb: serial: option.c: remove ONDA MT825UP product ID fromdriver
usb: serial: option: Add ONYX 3G device support
Eric Dumazet (3):
ipv6: ip6_sk_dst_check() must not assume ipv6 dst
neighbour: fix a race in neigh_destroy()
vlan: fix a race in egress prio management
Fabio Estevam (1):
ASoC: sglt5000: Fix SGTL5000_PLL_FRAC_DIV_MASK
Gabor Juhos (1):
rt2x00: read 5GHz TX power values from the correct offset
Gao feng (1):
ipv6: don't call addrconf_dst_alloc again when enable lo
Greg Kroah-Hartman (1):
Linux 3.0.88
Hannes Frederic Sowa (1):
ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data
Jan Kara (1):
writeback: Fix periodic writeback after fs mount
Jiri Olsa (2):
perf: Clone child context from parent context pmu
perf: Remove WARN_ON_ONCE() check in __perf_event_enable() for valid scenario
Linus Lüssing (1):
bridge: fix switched interval for MLD Query types
Luiz Angelo Daros de Luca (1):
usb: serial: cp210x: Add USB ID for Netgear Switches embedded serial adapter
Mathias Krause (1):
af_key: fix info leaks in notify messages
Olivier DANET (1):
sparc32: vm_area_struct access for old Sun SPARCs.
Peter Zijlstra (1):
perf: Fix perf_lock_task_context() vs RCU
Sami Rahman (1):
USB: cp210x: add MMB and PI ZigBee USB Device Support
Sreekanth Reddy (1):
SCSI: mpt2sas: fix firmware failure with wrong task attribute
Steffen Maier (1):
zfcp: status read buffers on first adapter open with link down
Steven Rostedt (Red Hat) (1):
tracing: Use current_uid() for critical time tracing
Thomas Gleixner (2):
tick: Prevent uncontrolled switch to oneshot mode
hrtimers: Move SMP function call to thread context
Wei Yongjun (1):
l2tp: add missing .owner to struct pppox_proto
bob picco (1):
sparc64 address-congruence property
dingtianhong (3):
ifb: fix rcu_sched self-detected stalls
dummy: fix oops when loading the dummy failed
ifb: fix oops when loading the ifb failed
zhangwei(Jovi) (1):
tracing: Fix irqs-off tag display in syscall tracing
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 87 +SUBLEVEL = 88 EXTRAVERSION = NAME = Sneaky Weasel
arch/sparc/kernel/asm-offsets.c +2 -0
@@ -34,6 +34,8 @@ int foo(void)DEFINE (AOFF_task_thread, offsetof(struct task_struct , thread));BLANK ();DEFINE (AOFF_mm_context, offsetof(struct mm_struct , context)); +BLANK (); +DEFINE (VMA_VM_MM , offsetof(struct vm_area_struct , vm_mm));/* DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28); */ return 0 ;
arch/sparc/mm/hypersparc.S +4 -4
@@ -74,7 +74,7 @@ hypersparc_flush_cache_mm_out: /* The things we do for performance... */ hypersparc_flush_cache_range: - ld [%o0 + 0x0], %o0 /* XXX vma->vm_mm, GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 #ifndef CONFIG_SMP ld [%o0 + AOFF_mm_context], %g1 cmp %g1, -1
@@ -163,7 +163,7 @@ hypersparc_flush_cache_range_out: */ /* Verified, my ass... */ hypersparc_flush_cache_page: - ld [%o0 + 0x0], %o0 /* XXX vma->vm_mm, GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 ld [%o0 + AOFF_mm_context], %g2 #ifndef CONFIG_SMP cmp %g2, -1
@@ -284,7 +284,7 @@ hypersparc_flush_tlb_mm_out: sta %g5, [%g1] ASI_M_MMUREGS hypersparc_flush_tlb_range: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 mov SRMMU_CTX_REG, %g1 ld [%o0 + AOFF_mm_context], %o3 lda [%g1] ASI_M_MMUREGS, %g5
@@ -307,7 +307,7 @@ hypersparc_flush_tlb_range_out: sta %g5, [%g1] ASI_M_MMUREGS hypersparc_flush_tlb_page: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 mov SRMMU_CTX_REG, %g1 ld [%o0 + AOFF_mm_context], %o3 andn %o1, (PAGE_SIZE - 1), %o1
arch/sparc/mm/init_64.c +8 -1
@@ -1071,7 +1071,14 @@ static int __init grab_mblocks(struct mdesc_handle *md) m->size = *val; val =mdesc_get_property (md, node,"address-congruence-offset" ,NULL ); - m->offset = *val; + +/* The address-congruence-offset property is optional. +* Explicity zero it be identifty this. +*/ +if (val) + m->offset = *val; +else + m->offset =0UL ;numadbg ("MBLOCK[%d]: base[%llx] size[%llx] offset[%llx]\n" , count -1 , m->base, m->size, m->offset);
arch/sparc/mm/swift.S +4 -4
@@ -105,7 +105,7 @@ swift_flush_cache_mm_out: .globl swift_flush_cache_range swift_flush_cache_range: - ld [%o0 + 0x0], %o0 /* XXX vma->vm_mm, GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 sub %o2, %o1, %o2 sethi %hi(4096), %o3 cmp %o2, %o3
@@ -116,7 +116,7 @@ swift_flush_cache_range: .globl swift_flush_cache_page swift_flush_cache_page: - ld [%o0 + 0x0], %o0 /* XXX vma->vm_mm, GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 70: ld [%o0 + AOFF_mm_context], %g2 cmp %g2, -1
@@ -219,7 +219,7 @@ swift_flush_sig_insns: .globl swift_flush_tlb_range .globl swift_flush_tlb_all swift_flush_tlb_range: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 swift_flush_tlb_mm: ld [%o0 + AOFF_mm_context], %g2 cmp %g2, -1
@@ -233,7 +233,7 @@ swift_flush_tlb_all_out: .globl swift_flush_tlb_page swift_flush_tlb_page: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 mov SRMMU_CTX_REG, %g1 ld [%o0 + AOFF_mm_context], %o3 andn %o1, (PAGE_SIZE - 1), %o1
arch/sparc/mm/tlb.c +1 -1
@@ -115,8 +115,8 @@ no_cache_flush: }if (!tb->active) { -global_flush_tlb_page (mm, vaddr);flush_tsb_user_page (mm, vaddr); +global_flush_tlb_page (mm, vaddr); goto out; }
arch/sparc/mm/tsunami.S +3 -3
@@ -24,7 +24,7 @@ /* Sliiick... */ tsunami_flush_cache_page: tsunami_flush_cache_range: - ld [%o0 + 0x0], %o0 /* XXX vma->vm_mm, GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 tsunami_flush_cache_mm: ld [%o0 + AOFF_mm_context], %g2 cmp %g2, -1
@@ -46,7 +46,7 @@ tsunami_flush_sig_insns: /* More slick stuff... */ tsunami_flush_tlb_range: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 tsunami_flush_tlb_mm: ld [%o0 + AOFF_mm_context], %g2 cmp %g2, -1
@@ -65,7 +65,7 @@ tsunami_flush_tlb_out: /* This one can be done in a fine grained manner... */ tsunami_flush_tlb_page: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 mov SRMMU_CTX_REG, %g1 ld [%o0 + AOFF_mm_context], %o3 andn %o1, (PAGE_SIZE - 1), %o1
arch/sparc/mm/viking.S +5 -5
@@ -109,7 +109,7 @@ viking_mxcc_flush_page: viking_flush_cache_page: viking_flush_cache_range: #ifndef CONFIG_SMP - ld [%o0 + 0x0], %o0 /* XXX vma->vm_mm, GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 #endif viking_flush_cache_mm: #ifndef CONFIG_SMP
@@ -149,7 +149,7 @@ viking_flush_tlb_mm: #endif viking_flush_tlb_range: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 mov SRMMU_CTX_REG, %g1 ld [%o0 + AOFF_mm_context], %o3 lda [%g1] ASI_M_MMUREGS, %g5
@@ -174,7 +174,7 @@ viking_flush_tlb_range: #endif viking_flush_tlb_page: - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 mov SRMMU_CTX_REG, %g1 ld [%o0 + AOFF_mm_context], %o3 lda [%g1] ASI_M_MMUREGS, %g5
@@ -240,7 +240,7 @@ sun4dsmp_flush_tlb_range: tst %g5 bne 3f mov SRMMU_CTX_REG, %g1 - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 ld [%o0 + AOFF_mm_context], %o3 lda [%g1] ASI_M_MMUREGS, %g5 sethi %hi(~((1 << SRMMU_PGDIR_SHIFT) - 1)), %o4
@@ -266,7 +266,7 @@ sun4dsmp_flush_tlb_page: tst %g5 bne 2f mov SRMMU_CTX_REG, %g1 - ld [%o0 + 0x00], %o0 /* XXX vma->vm_mm GROSS XXX */ + ld [%o0 + VMA_VM_MM], %o0 ld [%o0 + AOFF_mm_context], %o3 lda [%g1] ASI_M_MMUREGS, %g5 and %o1, PAGE_MASK, %o1
drivers/net/dummy.c +4 -0
@@ -186,6 +186,8 @@ static int __init dummy_init_module(void)rtnl_lock (); err =__rtnl_link_register (&dummy_link_ops); +if (err <0 ) + goto out;for (i =0 ; i < numdummies && !err; i++) { err =dummy_init_one ();
@@ -193,6 +195,8 @@ static int __init dummy_init_module(void) }if (err <0 )__rtnl_link_unregister (&dummy_link_ops); + +out:rtnl_unlock ();return err;
drivers/net/ifb.c +8 -1
@@ -33,6 +33,7 @@#include <linux/etherdevice.h> #include <linux/init.h> #include <linux/moduleparam.h> +#include <linux/sched.h> #include <net/pkt_sched.h> #include <net/net_namespace.h>
@@ -251,11 +252,17 @@ static int __init ifb_init_module(void)rtnl_lock (); err =__rtnl_link_register (&ifb_link_ops); +if (err <0 ) + goto out; -for (i =0 ; i < numifbs && !err; i++) +for (i =0 ; i < numifbs && !err; i++) { err =ifb_init_one (i); +cond_resched (); + }if (err)__rtnl_link_unregister (&ifb_link_ops); + +out:rtnl_unlock ();return err;
drivers/net/sunvnet.c +2 -0
@@ -1248,6 +1248,8 @@ static int vnet_port_remove(struct vio_dev *vdev)dev_set_drvdata (&vdev->dev,NULL );kfree (port); + +unregister_netdev (vp->dev); }return 0 ; }
drivers/net/wireless/rt2x00/rt2800lib.c +2 -2
@@ -4075,8 +4075,8 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) default_power2 =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A2 );for (i =14 ; i < spec->num_channels; i++) { - info[i].default_power1 = default_power1[i]; - info[i].default_power2 = default_power2[i]; + info[i].default_power1 = default_power1[i -14 ]; + info[i].default_power2 = default_power2[i -14 ]; } }
drivers/net/wireless/rt2x00/rt61pci.c +2 -1
@@ -2830,7 +2830,8 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) tx_power =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A_START );for (i =14 ; i < spec->num_channels; i++) { info[i].max_power =MAX_TXPOWER ; - info[i].default_power1 =TXPOWER_FROM_DEV (tx_power[i]); + info[i].default_power1 = +TXPOWER_FROM_DEV (tx_power[i -14 ]); } }
drivers/net/wireless/rt2x00/rt73usb.c +2 -1
@@ -2167,7 +2167,8 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) tx_power =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A_START );for (i =14 ; i < spec->num_channels; i++) { info[i].max_power =MAX_TXPOWER ; - info[i].default_power1 =TXPOWER_FROM_DEV (tx_power[i]); + info[i].default_power1 = +TXPOWER_FROM_DEV (tx_power[i -14 ]); } }
drivers/s390/scsi/zfcp_aux.c +4 -1
@@ -3,7 +3,7 @@* * Module interface and handling of zfcp data structures. * -* Copyright IBM Corporation 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ /*
@@ -23,6 +23,7 @@* Christof Schmitt * Martin Petermann * Sven Schuetz +* Steffen Maier */ #define KMSG_COMPONENT "zfcp"
@@ -414,6 +415,8 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) adapter->dma_parms.max_segment_size =ZFCP_QDIO_SBALE_LEN ; adapter->ccw_device->dev.dma_parms = &adapter->dma_parms; + adapter->stat_read_buf_num =FSF_STATUS_READS_RECOM ; +if (!zfcp_scsi_adapter_register (adapter))return adapter;
drivers/s390/scsi/zfcp_fsf.c +19 -6
@@ -3,7 +3,7 @@* * Implementation of FSF commands. * -* Copyright IBM Corporation 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ #define KMSG_COMPONENT "zfcp"
@@ -455,11 +455,8 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)fc_host_port_name (shost) = nsp->fl_wwpn;fc_host_node_name (shost) = nsp->fl_wwnn; -fc_host_port_id (shost) =ntoh24 (bottom->s_id); -fc_host_speed (shost) = bottom->fc_link_speed;fc_host_supported_classes (shost) =FC_COS_CLASS2 |FC_COS_CLASS3 ; - adapter->hydra_version = bottom->adapter_type; adapter->timer_ticks = bottom->timer_interval &ZFCP_FSF_TIMER_INT_MASK ; adapter->stat_read_buf_num =max (bottom->status_read_buf_num, (u16 )FSF_STATUS_READS_RECOM );
@@ -467,6 +464,18 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)if (fc_host_permanent_port_name (shost) ==-1 )fc_host_permanent_port_name (shost) =fc_host_port_name (shost); +zfcp_scsi_set_prot (adapter); + +/* no error return above here, otherwise must fix call chains */ +/* do not evaluate invalid fields */ +if (req->qtcb->header.fsf_status ==FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE ) +return 0 ; + +fc_host_port_id (shost) =ntoh24 (bottom->s_id); +fc_host_speed (shost) = bottom->fc_link_speed; + + adapter->hydra_version = bottom->adapter_type; +switch (bottom->fc_topology) {case FSF_TOPO_P2P : adapter->peer_d_id =ntoh24 (bottom->peer_d_id);
@@ -488,8 +497,6 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)return -EIO ; } -zfcp_scsi_set_prot (adapter); -return 0 ; }
@@ -534,8 +541,14 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)fc_host_port_type (shost) =FC_PORTTYPE_UNKNOWN ; adapter->hydra_version =0 ; +/* avoids adapter shutdown to be able to recognize +* events such as LINK UP */ +atomic_set_mask (ZFCP_STATUS_ADAPTER_XCONFIG_OK , + &adapter->status);zfcp_fsf_link_down_info_eval (req, &qtcb->header.fsf_status_qual.link_down_info); +if (zfcp_fsf_exchange_config_evaluate (req)) +return ;break ;default :zfcp_erp_adapter_shutdown (adapter,0 ,"fsecdh3" );
drivers/scsi/bnx2fc/bnx2fc_io.c +1 -1
@@ -1618,7 +1618,7 @@ static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req, fcp_sns_len =SCSI_SENSE_BUFFERSIZE ; } -memset (sc_cmd->sense_buffer,0 ,sizeof (sc_cmd->sense_buffer)); +memset (sc_cmd->sense_buffer,0 ,SCSI_SENSE_BUFFERSIZE );if (fcp_sns_len)memcpy (sc_cmd->sense_buffer, rq_data, fcp_sns_len);
drivers/scsi/megaraid/megaraid_sas_base.c +6 -4
@@ -4746,10 +4746,12 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, sense, sense_handle); } -for (i =0 ; i < ioc->sge_count && kbuff_arr[i]; i++) { -dma_free_coherent (&instance->pdev->dev, - kern_sge32[i].length, - kbuff_arr[i], kern_sge32[i].phys_addr); +for (i =0 ; i < ioc->sge_count; i++) { +if (kbuff_arr[i]) +dma_free_coherent (&instance->pdev->dev, + kern_sge32[i].length, + kbuff_arr[i], + kern_sge32[i].phys_addr); }megasas_return_cmd (instance, cmd);
drivers/scsi/mpt2sas/mpt2sas_scsih.c +1 -5
@@ -3740,11 +3740,7 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))else mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ; }else -/* MPI Revision I (UNIT = 0xA) - removed MPI2_SCSIIO_CONTROL_UNTAGGED */ -/* mpi_control |= MPI2_SCSIIO_CONTROL_UNTAGGED; -*/ - mpi_control |= (0x500 ); - + mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ; }else mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ;/* Make sure Device is not raid volume.
drivers/usb/serial/cp210x.c +4 -0
@@ -60,6 +60,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ + { USB_DEVICE(0x0846, 0x1100) }, /* NetGear Managed Switch M4100 series, M5300 series, M7100 series */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */
@@ -124,6 +125,8 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ + { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ + { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
@@ -154,6 +157,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ + { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */ { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */
drivers/usb/serial/option.c +13 -10
@@ -347,17 +347,12 @@ static void option_instat_callback(struct urb *urb);#define OLIVETTI_VENDOR_ID 0x0b3c#define OLIVETTI_PRODUCT_OLICARD100 0xc000#define OLIVETTI_PRODUCT_OLICARD145 0xc003 +#define OLIVETTI_PRODUCT_OLICARD200 0xc005/* Celot products */ #define CELOT_VENDOR_ID 0x211f#define CELOT_PRODUCT_CT680M 0x6801 -/* ONDA Communication vendor id */ -#define ONDA_VENDOR_ID 0x1ee8 - -/* ONDA MT825UP HSDPA 14.2 modem */ -#define ONDA_MT825UP 0x000b -/* Samsung products */ #define SAMSUNG_VENDOR_ID 0x04e8#define SAMSUNG_PRODUCT_GT_B3730 0x6889
@@ -450,7 +445,8 @@ static void option_instat_callback(struct urb *urb);/* Hyundai Petatel Inc. products */ #define PETATEL_VENDOR_ID 0x1ff4 -#define PETATEL_PRODUCT_NP10T 0x600e +#define PETATEL_PRODUCT_NP10T_600A 0x600a +#define PETATEL_PRODUCT_NP10T_600E 0x600e/* TP-LINK Incorporated products */ #define TPLINK_VENDOR_ID 0x2357
@@ -797,6 +793,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ + { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6280) }, /* BP3-USB & BP3-EXT HSDPA */ { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6008) },
@@ -832,7 +829,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) }, - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
@@ -1278,8 +1276,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) }, { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ - { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */ { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/ { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) }, { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM610) },
@@ -1351,9 +1349,12 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) }, { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) }, { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) }, - { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, + { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600A) }, + { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600E) }, { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(TPLINK_VENDOR_ID, 0x9000), /* TP-Link MA260 */ + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) }, { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x02, 0x01) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x00, 0x00) }, /* D-Link DWM-156 (variant) */
@@ -1361,6 +1362,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) }, { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) }, { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ + { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
fs/block_dev.c +9 -1
@@ -55,13 +55,21 @@ EXPORT_SYMBOL(I_BDEV);static void bdev_inode_switch_bdi (struct inode *inode,struct backing_dev_info *dst) { +bool wakeup_bdi = false; +spin_lock (&inode_wb_list_lock);spin_lock (&inode->i_lock); inode->i_data.backing_dev_info = dst; -if (inode->i_state &I_DIRTY ) +if (inode->i_state &I_DIRTY ) { +if (bdi_cap_writeback_dirty (dst) && !wb_has_dirty_io (&dst->wb)) + wakeup_bdi = true;list_move (&inode->i_wb_list, &dst->wb.b_dirty); + }spin_unlock (&inode->i_lock);spin_unlock (&inode_wb_list_lock); + +if (wakeup_bdi) +bdi_wakeup_thread_delayed (dst); }sector_t blkdev_max_block (struct block_device *bdev)
fs/lockd/svclock.c +4 -0
@@ -913,6 +913,7 @@ nlmsvc_retry_blocked(void)unsigned long timeout =MAX_SCHEDULE_TIMEOUT ;struct nlm_block *block; +spin_lock (&nlm_blocked_lock);while (!list_empty (&nlm_blocked) && !kthread_should_stop ()) { block = list_entry(nlm_blocked.next, struct nlm_block, b_list);
@@ -922,6 +923,7 @@ nlmsvc_retry_blocked(void) timeout = block->b_when - jiffies;break ; } +spin_unlock (&nlm_blocked_lock);dprintk ("nlmsvc_retry_blocked(%p, when=%ld)\n" , block, block->b_when);
@@ -931,7 +933,9 @@ nlmsvc_retry_blocked(void)retry_deferred_block (block); }else nlmsvc_grant_blocked (block); +spin_lock (&nlm_blocked_lock); } +spin_unlock (&nlm_blocked_lock);return timeout; }
include/linux/if_pppox.h +2 -2
@@ -127,11 +127,11 @@ struct pppoe_tag {struct pppoe_hdr {#if defined(__LITTLE_ENDIAN_BITFIELD) -__u8 ver :4 ;__u8 type :4 ; +__u8 ver :4 ;#elif defined(__BIG_ENDIAN_BITFIELD) -__u8 type :4 ;__u8 ver :4 ; +__u8 type :4 ;#else #error "Please fix <asm/byteorder.h>"#endif
include/net/addrconf.h +3 -0
@@ -81,6 +81,9 @@ extern int ipv6_dev_get_saddr(struct net *net,const struct in6_addr *daddr, unsigned int srcprefs, struct in6_addr *saddr); +extern int __ipv6_get_lladdr (struct inet6_dev *idev, +struct in6_addr *addr, +unsigned char banned_flags);extern int ipv6_get_lladdr (struct net_device *dev,struct in6_addr *addr,unsigned char banned_flags);
include/net/udp.h +1 -0
@@ -180,6 +180,7 @@ extern int udp_get_port(struct sock *sk, unsigned short snum,extern void udp_err (struct sk_buff *,u32 );extern int udp_sendmsg (struct kiocb *iocb,struct sock *sk,struct msghdr *msg,size_t len); +extern int udp_push_pending_frames (struct sock *sk);extern void udp_flush_pending_frames (struct sock *sk);extern int udp_rcv (struct sk_buff *skb);extern int udp_ioctl (struct sock *sk,int cmd,unsigned long arg);
kernel/events/core.c +25 -3
@@ -651,8 +651,18 @@ perf_lock_task_context(struct task_struct *task, int ctxn, unsigned long *flags) {struct perf_event_context *ctx; -rcu_read_lock (); retry: +/* +* One of the few rules of preemptible RCU is that one cannot do +* rcu_read_unlock() while holding a scheduler (or nested) lock when +* part of the read side critical section was preemptible -- see +* rcu_read_unlock_special(). +* +* Since ctx->lock nests under rq->lock we must ensure the entire read +* side critical section is non-preemptible. +*/ +preempt_disable (); +rcu_read_lock (); ctx =rcu_dereference (task->perf_event_ctxp[ctxn]);if (ctx) {/*
@@ -668,6 +678,8 @@ retry:raw_spin_lock_irqsave (&ctx->lock, *flags);if (ctx !=rcu_dereference (task->perf_event_ctxp[ctxn])) {raw_spin_unlock_irqrestore (&ctx->lock, *flags); +rcu_read_unlock (); +preempt_enable (); goto retry; }
@@ -677,6 +689,7 @@ retry: } }rcu_read_unlock (); +preempt_enable ();return ctx; }
@@ -1616,7 +1629,16 @@ static int __perf_event_enable(void *info)struct perf_cpu_context *cpuctx =__get_cpu_context (ctx);int err; -if (WARN_ON_ONCE (!ctx->is_active)) +/* +* There's a time window between 'ctx->is_active' check +* in perf_event_enable function and this place having: +* - IRQs on +* - ctx->lock unlocked +* +* where the task could be killed and 'ctx' deactivated +* by perf_event_exit_task. +*/ +if (!ctx->is_active)return -EINVAL ;raw_spin_lock (&ctx->lock);
@@ -7064,7 +7086,7 @@ inherit_task_group(struct perf_event *event, struct task_struct *parent,* child. */ - child_ctx =alloc_perf_context (event->pmu, child); + child_ctx =alloc_perf_context (parent_ctx->pmu, child);if (!child_ctx)return -ENOMEM ;
kernel/hrtimer.c +13 -15
@@ -707,17 +707,20 @@ static int hrtimer_switch_to_hres(void)return 1 ; } +static void clock_was_set_work (struct work_struct *work) +{ +clock_was_set (); +} + +static DECLARE_WORK(hrtimer_work, clock_was_set_work); +/* -* Called from timekeeping code to reprogramm the hrtimer interrupt -* device. If called from the timer interrupt context we defer it to -* softirq context. +* Called from timekeeping and resume code to reprogramm the hrtimer +* interrupt device on all cpus. */ void clock_was_set_delayed (void ) { -struct hrtimer_cpu_base *cpu_base = &__get_cpu_var (hrtimer_bases); - - cpu_base->clock_was_set =1 ; -__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); +schedule_work (&hrtimer_work); }#else
@@ -766,8 +769,10 @@ void hrtimers_resume(void)WARN_ONCE (!irqs_disabled (),KERN_INFO "hrtimers_resume() called with IRQs enabled!" ); +/* Retrigger on the local CPU */ retrigger_next_event (NULL ); -timerfd_clock_was_set (); +/* And schedule a retrigger for all others */ +clock_was_set_delayed (); }static inline void timer_stats_hrtimer_set_start_info (struct hrtimer *timer)
@@ -1416,13 +1421,6 @@ void hrtimer_peek_ahead_timers(void)static void run_hrtimer_softirq (struct softirq_action *h) { -struct hrtimer_cpu_base *cpu_base = &__get_cpu_var (hrtimer_bases); - -if (cpu_base->clock_was_set) { - cpu_base->clock_was_set =0 ; -clock_was_set (); - } -hrtimer_peek_ahead_timers (); }
kernel/time/tick-broadcast.c +9 -1
@@ -396,7 +396,15 @@ void tick_check_oneshot_broadcast(int cpu)if (cpumask_test_cpu (cpu,to_cpumask (tick_broadcast_oneshot_mask))) {struct tick_device *td = &per_cpu (tick_cpu_device, cpu); -clockevents_set_mode (td->evtdev,CLOCK_EVT_MODE_ONESHOT ); +/* +* We might be in the middle of switching over from +* periodic to oneshot. If the CPU has not yet +* switched over, leave the device alone. +*/ +if (td->mode ==TICKDEV_MODE_ONESHOT ) { +clockevents_set_mode (td->evtdev, +CLOCK_EVT_MODE_ONESHOT ); + } } }
kernel/trace/trace.c +9 -1
@@ -628,7 +628,15 @@ __update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)memcpy (max_data->comm, tsk->comm,TASK_COMM_LEN ); max_data->pid = tsk->pid; - max_data->uid =task_uid (tsk); +/* +* If tsk == current, then use current_uid(), as that does not use +* RCU. The irq tracer can be called out of RCU scope. +*/ +if (tsk == current) + max_data->uid =current_uid (); +else + max_data->uid =task_uid (tsk); + max_data->nice = tsk->static_prio -20 -MAX_RT_PRIO ; max_data->policy = tsk->policy; max_data->rt_priority = tsk->rt_priority;
kernel/trace/trace_syscalls.c +14 -4
@@ -304,6 +304,8 @@ void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)struct ring_buffer *buffer;int size;int syscall_nr; +unsigned long irq_flags; +int pc; syscall_nr =syscall_get_nr (current, regs);if (syscall_nr <0 )
@@ -317,8 +319,11 @@ void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id) size =sizeof (*entry) +sizeof (unsigned long ) * sys_data->nb_args; +local_save_flags (irq_flags); + pc =preempt_count (); + event =trace_current_buffer_lock_reserve (&buffer, - sys_data->enter_event->event.type, size,0 ,0 ); + sys_data->enter_event->event.type, size, irq_flags, pc);if (!event)return ;
@@ -328,7 +333,8 @@ void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)if (!filter_current_check_discard (buffer, sys_data->enter_event, entry, event)) -trace_current_buffer_unlock_commit (buffer, event,0 ,0 ); +trace_current_buffer_unlock_commit (buffer, event, + irq_flags, pc); }void ftrace_syscall_exit (void *ignore,struct pt_regs *regs,long ret)
@@ -338,6 +344,8 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)struct ring_buffer_event *event;struct ring_buffer *buffer;int syscall_nr; +unsigned long irq_flags; +int pc; syscall_nr =syscall_get_nr (current, regs);if (syscall_nr <0 )
@@ -350,7 +358,8 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)return ; event =trace_current_buffer_lock_reserve (&buffer, - sys_data->exit_event->event.type,sizeof (*entry),0 ,0 ); + sys_data->exit_event->event.type,sizeof (*entry), + irq_flags, pc);if (!event)return ;
@@ -360,7 +369,8 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)if (!filter_current_check_discard (buffer, sys_data->exit_event, entry, event)) -trace_current_buffer_unlock_commit (buffer, event,0 ,0 ); +trace_current_buffer_unlock_commit (buffer, event, + irq_flags, pc); }int reg_event_syscall_enter (struct ftrace_event_call *call)
net/8021q/vlan_dev.c +7 -0
@@ -70,6 +70,8 @@ vlan_dev_get_egress_qos_mask(struct net_device *dev, struct sk_buff *skb) {struct vlan_priority_tci_mapping *mp; +smp_rmb ();/* coupled with smp_wmb() in vlan_dev_set_egress_priority() */ + mp =vlan_dev_info (dev)->egress_priority_map[(skb->priority &0xF )];while (mp) {if (mp->priority == skb->priority) {
@@ -230,6 +232,11 @@ int vlan_dev_set_egress_priority(const struct net_device *dev, np->next = mp; np->priority = skb_prio; np->vlan_qos = vlan_qos; +/* Before inserting this element in hash table, make sure all its fields +* are committed to memory. +* coupled with smp_rmb() in vlan_dev_get_egress_qos_mask() +*/ +smp_wmb (); vlan->egress_priority_map[skb_prio &0xF ] = np;if (vlan_qos) vlan->nr_egress_mappings++;
net/bridge/br_multicast.c +3 -2
@@ -467,8 +467,9 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,skb_set_transport_header (skb, skb->len); mldq = (struct mld_msg *)icmp6_hdr (skb); - interval =ipv6_addr_any (group) ? br->multicast_last_member_interval : - br->multicast_query_response_interval; + interval =ipv6_addr_any (group) ? + br->multicast_query_response_interval : + br->multicast_last_member_interval; mldq->mld_type =ICMPV6_MGM_QUERY ; mldq->mld_code =0 ;
net/core/neighbour.c +7 -5
@@ -237,7 +237,7 @@ static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev)we must kill timers etc. and move it to safe state. */ -skb_queue_purge (&n->arp_queue); +__skb_queue_purge (&n->arp_queue); n->output = neigh_blackhole;if (n->nud_state &NUD_VALID ) n->nud_state =NUD_NOARP ;
@@ -291,7 +291,7 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl)if (!n) goto out_entries; -skb_queue_head_init (&n->arp_queue); +__skb_queue_head_init (&n->arp_queue);rwlock_init (&n->lock);seqlock_init (&n->ha_lock); n->updated = n->used = now;
@@ -712,7 +712,9 @@ void neigh_destroy(struct neighbour *neigh)hh_cache_put (hh); } -skb_queue_purge (&neigh->arp_queue); +write_lock_bh (&neigh->lock); +__skb_queue_purge (&neigh->arp_queue); +write_unlock_bh (&neigh->lock);dev_put (neigh->dev);neigh_parms_put (neigh->parms);
@@ -864,7 +866,7 @@ static void neigh_invalidate(struct neighbour *neigh) neigh->ops->error_report (neigh, skb);write_lock (&neigh->lock); } -skb_queue_purge (&neigh->arp_queue); +__skb_queue_purge (&neigh->arp_queue); }/* Called when a timer expires for a neighbour entry. */
@@ -1188,7 +1190,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,write_lock_bh (&neigh->lock); } -skb_queue_purge (&neigh->arp_queue); +__skb_queue_purge (&neigh->arp_queue); } out:if (update_isrouter) {
net/ipv4/udp.c +2 -1
@@ -765,7 +765,7 @@ send:/* * Push out all pending data as one UDP datagram. Socket is locked. */ -static int udp_push_pending_frames (struct sock *sk) +int udp_push_pending_frames (struct sock *sk) {struct udp_sock *up =udp_sk (sk);struct inet_sock *inet =inet_sk (sk);
@@ -784,6 +784,7 @@ out: up->pending =0 ;return err; } +EXPORT_SYMBOL (udp_push_pending_frames);int udp_sendmsg (struct kiocb *iocb,struct sock *sk,struct msghdr *msg,size_t len)
net/ipv6/addrconf.c +21 -10
@@ -1235,6 +1235,23 @@ try_nextdev: }EXPORT_SYMBOL (ipv6_dev_get_saddr); +int __ipv6_get_lladdr (struct inet6_dev *idev,struct in6_addr *addr, +unsigned char banned_flags) +{ +struct inet6_ifaddr *ifp; +int err = -EADDRNOTAVAIL ; + +list_for_each_entry (ifp, &idev->addr_list, if_list) { +if (ifp->scope ==IFA_LINK && + !(ifp->flags & banned_flags)) { +ipv6_addr_copy (addr, &ifp->addr); + err =0 ; +break ; + } + } +return err; +} +int ipv6_get_lladdr (struct net_device *dev,struct in6_addr *addr,unsigned char banned_flags) {
@@ -1244,17 +1261,8 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,rcu_read_lock (); idev =__in6_dev_get (dev);if (idev) { -struct inet6_ifaddr *ifp; -read_lock_bh (&idev->lock); -list_for_each_entry (ifp, &idev->addr_list, if_list) { -if (ifp->scope ==IFA_LINK && - !(ifp->flags & banned_flags)) { -ipv6_addr_copy (addr, &ifp->addr); - err =0 ; -break ; - } - } + err =__ipv6_get_lladdr (idev, addr, banned_flags);read_unlock_bh (&idev->lock); }rcu_read_unlock ();
@@ -2357,6 +2365,9 @@ static void init_loopback(struct net_device *dev)if (sp_ifa->flags & (IFA_F_DADFAILED |IFA_F_TENTATIVE ))continue ; +if (sp_ifa->rt) +continue ; + sp_rt =addrconf_dst_alloc (idev, &sp_ifa->addr,0 );/* Failure cases are ignored */
net/ipv6/ip6_output.c +7 -1
@@ -925,11 +925,17 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk, const struct flowi6 *fl6) {struct ipv6_pinfo *np =inet6_sk (sk); -struct rt6_info *rt = (struct rt6_info *)dst; +struct rt6_info *rt;if (!dst) goto out; +if (dst->ops->family !=AF_INET6 ) { +dst_release (dst); +return NULL ; + } + + rt = (struct rt6_info *)dst;/* Yes, checking route validity in not connected * case is not very simple. Take into account, * that we do not support routing by source, TOS,
net/ipv6/mcast.c +10 -8
@@ -1334,8 +1334,9 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted)return scount; } -static struct sk_buff *mld_newpack (struct net_device *dev,int size) +static struct sk_buff *mld_newpack (struct inet6_dev *idev,int size) { +struct net_device *dev = idev->dev;struct net *net =dev_net (dev);struct sock *sk = net->ipv6.igmp_sk;struct sk_buff *skb;
@@ -1358,7 +1359,7 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size)skb_reserve (skb,LL_RESERVED_SPACE (dev)); -if (ipv6_get_lladdr (dev, &addr_buf,IFA_F_TENTATIVE )) { +if (__ipv6_get_lladdr (idev, &addr_buf,IFA_F_TENTATIVE )) {/* <draft-ietf-magma-mld-source-05.txt>: * use unspecified address as the source address * when a valid link-local address is not available.
@@ -1461,7 +1462,7 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ifmcaddr6 *pmc,struct mld2_grec *pgr;if (!skb) - skb =mld_newpack (dev, dev->mtu); + skb =mld_newpack (pmc->idev, dev->mtu);if (!skb)return NULL ; pgr = (struct mld2_grec *)skb_put (skb,sizeof (struct mld2_grec ));
@@ -1481,7 +1482,8 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ifmcaddr6 *pmc,static struct sk_buff *add_grec (struct sk_buff *skb,struct ifmcaddr6 *pmc,int type,int gdeleted,int sdeleted) { -struct net_device *dev = pmc->idev->dev; +struct inet6_dev *idev = pmc->idev; +struct net_device *dev = idev->dev;struct mld2_report *pmr;struct mld2_grec *pgr =NULL ;struct ip6_sf_list *psf, *psf_next, *psf_prev, **psf_list;
@@ -1510,7 +1512,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, AVAILABLE(skb) < grec_size(pmc, type, gdeleted, sdeleted)) {if (skb)mld_sendpack (skb); - skb =mld_newpack (dev, dev->mtu); + skb =mld_newpack (idev, dev->mtu); } } first =1 ;
@@ -1537,7 +1539,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc, pgr->grec_nsrcs =htons (scount);if (skb)mld_sendpack (skb); - skb =mld_newpack (dev, dev->mtu); + skb =mld_newpack (idev, dev->mtu); first =1 ; scount =0 ; }
@@ -1592,8 +1594,8 @@ static void mld_send_report(struct inet6_dev *idev, struct ifmcaddr6 *pmc)struct sk_buff *skb =NULL ;int type; +read_lock_bh (&idev->lock);if (!pmc) { -read_lock_bh (&idev->lock);for (pmc=idev->mc_list; pmc; pmc=pmc->next) {if (pmc->mca_flags &MAF_NOREPORT )continue ;
@@ -1605,7 +1607,6 @@ static void mld_send_report(struct inet6_dev *idev, struct ifmcaddr6 *pmc) skb =add_grec (skb, pmc, type,0 ,0 );spin_unlock_bh (&pmc->mca_lock); } -read_unlock_bh (&idev->lock); }else {spin_lock_bh (&pmc->mca_lock);if (pmc->mca_sfcount[MCAST_EXCLUDE ])
@@ -1615,6 +1616,7 @@ static void mld_send_report(struct inet6_dev *idev, struct ifmcaddr6 *pmc) skb =add_grec (skb, pmc, type,0 ,0 );spin_unlock_bh (&pmc->mca_lock); } +read_unlock_bh (&idev->lock);if (skb)mld_sendpack (skb); }
net/ipv6/udp.c +6 -1
@@ -892,11 +892,16 @@ static int udp_v6_push_pending_frames(struct sock *sk)struct udphdr *uh;struct udp_sock *up =udp_sk (sk);struct inet_sock *inet =inet_sk (sk); -struct flowi6 *fl6 = &inet->cork.fl.u.ip6; +struct flowi6 *fl6;int err =0 ;int is_udplite =IS_UDPLITE (sk);__wsum csum =0 ; +if (up->pending ==AF_INET ) +return udp_push_pending_frames (sk); + + fl6 = &inet->cork.fl.u.ip6; +/* Grab the skbuff where UDP header space exists. */ if ((skb =skb_peek (&sk->sk_write_queue)) ==NULL ) goto out;
net/key/af_key.c +2 -0
@@ -1705,6 +1705,7 @@ static int key_notify_sa_flush(const struct km_event *c) hdr->sadb_msg_version =PF_KEY_V2 ; hdr->sadb_msg_errno = (uint8_t )0 ; hdr->sadb_msg_len = (sizeof (struct sadb_msg ) /sizeof (uint64_t )); + hdr->sadb_msg_reserved =0 ;pfkey_broadcast (skb,GFP_ATOMIC ,BROADCAST_ALL ,NULL , c->net);
@@ -2686,6 +2687,7 @@ static int key_notify_policy_flush(const struct km_event *c) hdr->sadb_msg_version =PF_KEY_V2 ; hdr->sadb_msg_errno = (uint8_t )0 ; hdr->sadb_msg_len = (sizeof (struct sadb_msg ) /sizeof (uint64_t )); + hdr->sadb_msg_reserved =0 ;pfkey_broadcast (skb_out,GFP_ATOMIC ,BROADCAST_ALL ,NULL , c->net);return 0 ;
net/l2tp/l2tp_ppp.c +2 -1
@@ -1771,7 +1771,8 @@ static const struct proto_ops pppol2tp_ops = {static const struct pppox_proto pppol2tp_proto = { .create = pppol2tp_create, - .ioctl = pppol2tp_ioctl + .ioctl = pppol2tp_ioctl, + .owner =THIS_MODULE , };#ifdef CONFIG_L2TP_V3
net/x25/af_x25.c +8 -7
@@ -1584,11 +1584,11 @@ out_cud_release:case SIOCX25CALLACCPTAPPRV : { rc = -EINVAL ;lock_sock (sk); -if (sk->sk_state !=TCP_CLOSE ) -break ; -clear_bit (X25_ACCPT_APPRV_FLAG , &x25->flags); +if (sk->sk_state ==TCP_CLOSE ) { +clear_bit (X25_ACCPT_APPRV_FLAG , &x25->flags); + rc =0 ; + }release_sock (sk); - rc =0 ;break ; }
@@ -1596,14 +1596,15 @@ out_cud_release: rc = -EINVAL ;lock_sock (sk);if (sk->sk_state !=TCP_ESTABLISHED ) -break ; + goto out_sendcallaccpt_release;/* must call accptapprv above */ if (test_bit (X25_ACCPT_APPRV_FLAG , &x25->flags)) -break ; + goto out_sendcallaccpt_release;x25_write_internal (sk,X25_CALL_ACCEPTED ); x25->state =X25_STATE_3 ; -release_sock (sk); rc =0 ; +out_sendcallaccpt_release: +release_sock (sk);break ; }
sound/soc/codecs/sgtl5000.h +1 -1
@@ -347,7 +347,7 @@#define SGTL5000_PLL_INT_DIV_MASK 0xf800#define SGTL5000_PLL_INT_DIV_SHIFT 11#define SGTL5000_PLL_INT_DIV_WIDTH 5 -#define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 +#define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff#define SGTL5000_PLL_FRAC_DIV_SHIFT 0#define SGTL5000_PLL_FRAC_DIV_WIDTH 11
sound/usb/6fire/pcm.c +1 -1
@@ -541,7 +541,7 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer(snd_pcm_uframes_t ret;if (rt->panic || !sub) -return SNDRV_PCM_STATE_XRUN ; +return SNDRV_PCM_POS_XRUN ;spin_lock_irqsave (&sub->lock, flags); ret = sub->dma_off;