Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1287405 > unrolled thread
| Started by | Luis Henriques <luis.henriques@canonical.com> |
|---|---|
| First post | 2015-12-09 11:50 +0100 |
| Last post | 2015-12-09 12:50 +0100 |
| Articles | 6 — 2 participants |
Back to article view | Back to linux.kernel
[3.16.y-ckt stable] Linux 3.16.7-ckt21 stable review Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
[PATCH 3.16.y-ckt 011/126] net: avoid NULL deref in inet_ctl_sock_destroy() Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
[PATCH 3.16.y-ckt 005/126] stmmac: Correctly report PTP capabilities. Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
[PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 11:50 +0100
Re: [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx Bjørn Mork <bjorn@mork.no> - 2015-12-09 12:30 +0100
Re: [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx Luis Henriques <luis.henriques@canonical.com> - 2015-12-09 12:50 +0100
| From | Luis Henriques <luis.henriques@canonical.com> |
|---|---|
| Date | 2015-12-09 11:50 +0100 |
| Subject | [3.16.y-ckt stable] Linux 3.16.7-ckt21 stable review |
| Message-ID | <qDJo5-6xK-3@gated-at.bofh.it> |
This is the start of the review cycle for the Linux 3.16.7-ckt21 stable kernel.
This version contains 126 new patches, summarized below. The new patches are
posted as replies to this message and also available in this git branch:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-review
git://kernel.ubuntu.com/ubuntu/linux.git linux-3.16.y-review
The review period for version 3.16.7-ckt21 will be open for the next three days.
To report a problem, please reply to the relevant follow-up patch message.
For more information about the Linux 3.16.y-ckt extended stable kernel version,
see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable .
-Luis
--
Documentation/filesystems/proc.txt | 5 +-
MAINTAINERS | 1 +
arch/arm/common/edma.c | 6 +-
arch/arm/mach-pxa/include/mach/pxa27x.h | 2 +-
arch/arm/mach-pxa/pxa27x.c | 2 +-
arch/arm/mm/dma-mapping.c | 7 +
arch/arm64/include/asm/ptrace.h | 16 +-
arch/mips/include/asm/atomic.h | 2 +-
arch/s390/kvm/kvm-s390.c | 4 +-
arch/x86/include/uapi/asm/kvm.h | 3 +
arch/x86/include/uapi/asm/svm.h | 1 +
arch/x86/kernel/head_64.S | 8 +
arch/x86/kernel/setup.c | 8 +
arch/x86/kernel/verify_cpu.S | 12 +-
arch/x86/kvm/svm.c | 22 +--
arch/x86/kvm/vmx.c | 24 +--
arch/x86/xen/setup.c | 2 +-
arch/xtensa/include/asm/asmmacro.h | 7 +-
arch/xtensa/include/asm/pgtable.h | 1 +
arch/xtensa/include/asm/vectors.h | 9 +-
arch/xtensa/kernel/Makefile | 1 +
arch/xtensa/kernel/entry.S | 8 +-
arch/xtensa/kernel/head.S | 2 +-
arch/xtensa/kernel/setup.c | 9 +-
arch/xtensa/kernel/vectors.S | 4 +-
arch/xtensa/kernel/vmlinux.lds.S | 12 +-
arch/xtensa/lib/usercopy.S | 6 +-
arch/xtensa/platforms/iss/setup.c | 2 +
arch/xtensa/platforms/xt2000/setup.c | 2 +
arch/xtensa/platforms/xtfpga/setup.c | 2 +
crypto/algif_hash.c | 12 +-
drivers/acpi/osl.c | 9 +-
drivers/bluetooth/ath3k.c | 4 +
drivers/bluetooth/btusb.c | 2 +
drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
drivers/char/tpm/tpm_of.c | 3 +-
drivers/clk/versatile/clk-icst.c | 4 +-
drivers/dma/dw/core.c | 12 +-
drivers/firewire/ohci.c | 5 +
drivers/gpu/drm/ast/ast_drv.h | 1 +
drivers/gpu/drm/ast/ast_fb.c | 7 +
drivers/gpu/drm/ast/ast_main.c | 1 +
drivers/gpu/drm/ast/ast_mode.c | 2 +
drivers/gpu/drm/drm_crtc.c | 5 +-
drivers/gpu/drm/i915/intel_display.c | 3 +
drivers/gpu/drm/radeon/si_dpm.c | 2 +
drivers/hid/hid-core.c | 2 +-
drivers/hsi/controllers/omap_ssi_port.c | 2 +-
drivers/hsi/hsi.c | 1 -
drivers/input/mouse/elantech.c | 7 +
drivers/iommu/intel-iommu.c | 9 +-
drivers/md/dm-mpath.c | 7 +-
drivers/md/raid0.c | 67 +++----
drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 9 +-
drivers/media/v4l2-core/videobuf2-dma-contig.c | 5 +-
drivers/mfd/twl6040.c | 2 +
drivers/mtd/mtd_blkdevs.c | 10 +-
drivers/mtd/mtdpart.c | 4 +-
drivers/net/bonding/bond_main.c | 1 +
drivers/net/can/dev.c | 2 +-
drivers/net/ethernet/marvell/mvneta.c | 2 +-
.../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +-
drivers/net/macvtap.c | 2 +-
drivers/net/usb/qmi_wwan.c | 10 +-
drivers/net/wireless/mwifiex/debugfs.c | 14 +-
drivers/of/fdt.c | 5 +-
drivers/of/of_reserved_mem.c | 4 +
drivers/platform/x86/ideapad-laptop.c | 7 +
drivers/power/wm831x_power.c | 6 +-
drivers/rtc/rtc-ds1307.c | 4 +-
drivers/scsi/megaraid/megaraid_sas.h | 2 +
drivers/scsi/megaraid/megaraid_sas_base.c | 15 +-
drivers/scsi/scsi_sysfs.c | 18 +-
drivers/scsi/storvsc_drv.c | 3 +-
drivers/spi/spi-atmel.c | 3 +-
drivers/spi/spi-dw.c | 6 +-
drivers/spi/spi-ti-qspi.c | 3 +-
drivers/staging/rtl8712/usb_intf.c | 1 +
drivers/thermal/samsung/exynos_tmu.c | 33 ++--
drivers/tty/n_tty.c | 15 +-
drivers/usb/host/ehci-orion.c | 3 +-
drivers/usb/serial/qcserial.c | 2 +
fs/binfmt_elf.c | 10 +-
fs/btrfs/file.c | 16 +-
fs/btrfs/inode.c | 92 ++++++++--
fs/btrfs/ioctl.c | 195 ++++++++++++++++-----
fs/btrfs/xattr.c | 4 +-
fs/cachefiles/rdwr.c | 79 +++++----
fs/ceph/mds_client.c | 2 +-
fs/ext4/ext4_jbd2.c | 6 +-
fs/ext4/resize.c | 4 +-
fs/ext4/super.c | 12 +-
fs/fscache/netfs.c | 38 ++--
fs/fscache/page.c | 2 +-
fs/jbd2/journal.c | 6 +-
fs/lockd/host.c | 7 +-
fs/lockd/mon.c | 36 ++--
fs/lockd/netns.h | 1 +
fs/lockd/svc.c | 1 +
fs/lockd/svc4proc.c | 2 +-
fs/lockd/svcproc.c | 2 +-
fs/nfs/nfs4state.c | 2 +-
fs/pipe.c | 9 +-
fs/proc/array.c | 16 +-
fs/proc/base.c | 9 +-
fs/proc/fd.c | 14 +-
fs/splice.c | 12 +-
include/linux/acpi.h | 6 +
include/linux/jbd2.h | 1 +
include/linux/lockd/lockd.h | 9 +-
include/net/inet_common.h | 3 +-
include/net/netfilter/nf_conntrack.h | 4 -
kernel/events/core.c | 4 +
kernel/printk/printk.c | 12 +-
lib/devres.c | 2 +-
mm/slab.c | 5 +-
net/bluetooth/hidp/core.c | 14 ++
net/core/dst.c | 2 +-
net/ipv4/ip_output.c | 2 +-
net/ipv4/ipmr.c | 6 +-
net/ipv4/tcp_input.c | 5 +-
net/ipv6/sit.c | 27 +--
net/ipv6/tunnel6.c | 12 +-
net/irda/irlmp.c | 2 +-
net/mac80211/mlme.c | 2 +-
net/mac80211/trace.h | 10 +-
net/mac80211/util.c | 7 +
net/netfilter/nfnetlink.c | 2 +-
net/packet/af_packet.c | 86 +++++----
net/rds/tcp_recv.c | 11 +-
net/sunrpc/xprtrdma/verbs.c | 66 ++-----
scripts/recordmcount.h | 2 +-
sound/firewire/bebob/Makefile | 2 +-
sound/firewire/bebob/bebob_maudio.c | 2 +-
sound/firewire/fireworks/Makefile | 2 +-
sound/firewire/fireworks/fireworks_command.c | 2 +-
sound/pci/hda/hda_intel.c | 10 +-
sound/pci/hda/patch_realtek.c | 13 ++
sound/pci/hda/patch_sigmatel.c | 1 +
tools/perf/Documentation/perf-trace.txt | 1 -
140 files changed, 931 insertions(+), 538 deletions(-)
Alex Deucher (1):
drm/radeon: add quirk for ASUS R7 370
Alexandra Yates (1):
ALSA: hda - Add Intel Lewisburg device IDs Audio
Andrey Ryabinin (1):
lockd: create NSM handles per net namespace
Andrzej Hajda (1):
[media] v4l2-compat-ioctl32: fix alignment for ARM64
Andy Leiserson (1):
fix calculation of meta_bg descriptor backups
Andy Shevchenko (2):
spi: dw: explicitly free IRQ handler in dw_spi_remove_host()
dmaengine: dw: convert to __ffs()
Ani Sinha (1):
ipmr: fix possible race resulting from improper usage of IP_INC_STATS_BH() in preemptible context.
Arik Nemtsov (1):
mac80211: allow null chandef in tracing
Arnd Bergmann (2):
ARM: pxa: remove incorrect __init annotation on pxa27x_set_pwrmode
ceph: fix message length computation
Bjørn Mork (3):
qmi_wwan: add Sierra Wireless MC74xx/EM74xx
qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module
USB: qcserial: add Sierra Wireless MC74xx/EM74xx
Boris BREZILLON (1):
mtd: mtdpart: fix add_mtd_partitions error path
Borislav Petkov (1):
x86/cpu: Call verify_cpu() after having entered long mode too
Brian Norris (1):
mtd: blkdevs: fix potential deadlock + lockdep warnings
Catalin Marinas (1):
mm: slab: only move management objects off-slab for sizes larger than KMALLOC_MIN_SIZE
Chen Yu (1):
ACPI: Use correct IRQ when uninstalling ACPI interrupt handler
Christoph Hellwig (1):
scsi: restart list search after unlock in scsi_remove_target
Christophe JAILLET (1):
TPM: Avoid reference to potentially freed memory
Christophe Leroy (1):
splice: sendfile() at once fails for big files
Chuck Lever (1):
xprtrdma: Re-arm after missed events
Daeho Jeong (1):
ext4, jbd2: ensure entering into panic after recording an error in superblock
Dan Carpenter (3):
irda: precedence bug in irlmp_seq_hb_idx()
mwifiex: fix mwifiex_rdeeprom_read()
devres: fix a for loop bounds check
David Herrmann (1):
Bluetooth: hidp: fix device disconnect on idle timeout
David Hildenbrand (1):
KVM: s390: SCA must not cross page boundaries
David Howells (1):
FS-Cache: Handle a write to the page immediately beyond the EOF marker
David Mosberger-Tang (1):
spi: atmel: Fix DMA-setup for transfers with more than 8 bits per word
David Ward (1):
net: qmi_wwan: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module
David Woodhouse (1):
iommu/vt-d: Fix ATSR handling for Root-Complex integrated endpoints
Dmitry Tunin (2):
Bluetooth: ath3k: Add new AR3012 0930:021c id
Bluetooth: ath3k: Add support of AR3012 0cf3:817b device
Egbert Eich (1):
drm/ast: Initialized data needed to map fbdev memory
Eric Biggers (1):
fs/pipe.c: return error code rather than 0 in pipe_write()
Eric Dumazet (4):
sit: fix sit0 percpu double allocations
net: avoid NULL deref in inet_ctl_sock_destroy()
net: fix a race in dst_release()
packet: fix match_fanout_group()
Eric Northup (1):
KVM: x86: work around infinite loop in microcode when #AC is delivered
Eric W. Biederman (1):
ipv4: Fix ip_queue_xmit to pass sk into ip_local_out_sk
Filipe Manana (5):
Btrfs: fix file corruption and data loss after cloning inline extents
Btrfs: fix truncation of compressed and inlined extents
Btrfs: fix race leading to incorrect item deletion when dropping extents
Btrfs: fix race leading to BUG_ON when running delalloc for nodatacow
Btrfs: fix race when listing an inode's xattrs
Flavio Leitner (1):
netfilter: remove dead code
Florian Westphal (1):
netfilter: nfnetlink: don't probe module if it exists
Francesco Ruggeri (1):
packet: race condition in packet_bind
Geliang Tang (1):
hsi: fix double kfree
Greg Kroah-Hartman (1):
Revert "mm: Check if section present during memory block (un)registering"
Hans de Goede (1):
ideapad-laptop: Add Lenovo Yoga 900 to no_hw_rfkill dmi list
Herbert Xu (1):
crypto: algif_hash - Only export and import on sockets with data
Hon Ching \\(Vicky\\) Lo (1):
vTPM: fix memory allocation flag for rtce buffer at kernel boot
Ingo Molnar (1):
fs/proc, core/debug: Don't expose absolute kernel addresses via wchan
Jani Nikula (1):
drm/i915: add quirk to enable backlight on Dell Chromebook 11 (2015)
Janusz.Dziedzic@tieto.com (1):
mac80211: fix divide by zero when NOA update
Jason Liu (1):
drivers: of: of_reserved_mem: fixup the alignment with CMA setup
Jason Wang (1):
macvtap: unbreak receiving of gro skb with frag list
Jay Vosburgh (1):
bonding: fix panic on non-ARPHRD_ETHER enslave failure
Johannes Berg (1):
mac80211: fix driver RSSI event calculations
Jonas Gorski (1):
usb: ehci-orion: fix probe for !GENERIC_PHY
K. Y. Srinivasan (1):
storvsc: Don't set the SRB_FLAGS_QUEUE_ACTION_ENABLE flag
Kailang Yang (1):
ALSA: hda/realtek - Dell XPS one ALC3260 speaker no sound after resume back
Kinglong Mee (2):
FS-Cache: Increase reference of parent after registering, netfs success
FS-Cache: Don't override netfs's primary_index if registering failed
Kosuke Tatsukawa (1):
tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c
Krzysztof Kozlowski (1):
thermal: exynos: Fix unbalanced regulator disable on probe failure
Krzysztof Mazur (1):
x86/setup: Fix low identity map for >= 2GB kernel range
Larry Finger (1):
staging: rtl8712: Add device ID for Sitecom WLA2100
Linus Walleij (1):
clk: versatile-icst: fix memory leak
Lukas Czerner (1):
ext4: fix potential use after free in __ext4_journal_stop
Lukas Wunner (1):
drm: Fix return value of drm_framebuffer_init()
Maciej W. Rozycki (1):
binfmt_elf: Don't clobber passed executable's file header
Malcolm Crossley (1):
x86/xen: Do not clip xen_e820_map to xen_e820_map_entries when sanitizing map
Marek Szyprowski (2):
ARM: 8426/1: dma-mapping: add missing range check in dma_mmap()
ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()
Marek Vasut (1):
can: Use correct type in sizeof() in nla_put()
Masahiro Yamada (1):
of/fdt: fix error checking for earlycon address
Mathias Krause (1):
printk: prevent userland from spoofing kernel messages
Mauricio Faria de Oliveira (1):
Revert "dm mpath: fix stalls when handling invalid ioctls"
Max Filippov (3):
xtensa: fixes for configs without loop option
xtensa: fix secondary core boot in SMP
xtensa: nommu: provide _PAGE_CHG_MASK definition
Maxim Sheviakov (2):
drm/radeon: add quirk for MSI R7 370
drm/radeon: fix quirk for MSI R7 370 Armor 2X
Maxime Ripard (1):
net: mvneta: Fix CPU_MAP registers initialisation
Michal Kubeček (1):
ipv6: fix tunnel error handling
Nadav Amit (1):
KVM: x86: Defining missing x86 vectors
NeilBrown (2):
md/raid0: update queue parameter in a safer location.
md/raid0: apply base queue limits *before* disk_stack_limits
Oleg Nesterov (1):
proc: actually make proc_fd_permission() thread-friendly
Olga Kornievskaia (1):
Failing to send a CLOSE if file is opened WRONLY and server reboots on a 4.x mount
Paolo Bonzini (2):
x86/setup: Extend low identity map to cover whole kernel range
KVM: svm: unconditionally intercept #DB
Peter Feiner (1):
perf trace: Fix documentation for -i
Peter Oberparleiter (1):
scsi_sysfs: Fix queue_ramp_up_period return code
Peter Ujfalusi (1):
ARM: common: edma: Fix channel parameter for irq callbacks
Peter Zijlstra (1):
perf: Fix inherited events vs. tracepoint filters
Phil Reid (1):
stmmac: Correctly report PTP capabilities.
Radim Krčmář (1):
KVM: VMX: fix SMEP and SMAP without EPT
Ralf Baechle (1):
MIPS: atomic: Fix comment describing atomic64_add_unless's return value.
Richard Purdie (1):
HID: core: Avoid uninitialized buffer access
Robin Murphy (1):
arm64: Fix compat register mappings
Roger Quadros (1):
hsi: omap_ssi_port: Prevent warning if cawake_gpio is not defined.
Sowmini Varadhan (1):
RDS-TCP: Recover correctly from pskb_pull()/pksb_trim() failure in rds_tcp_data_recv
Stefan Richter (1):
firewire: ohci: fix JMicron JMB38x IT context discovery
Takashi Iwai (3):
ALSA: hda - Apply pin fixup for HP ProBook 6550b
Input: elantech - add Fujitsu Lifebook U745 to force crc_enabled
ALSA: hda - Disable 64bit address for Creative HDA controllers
Takashi Sakamoto (3):
ALSA: fireworks/bebob/oxfw/dice: enable to make as built-in
ALSA: fireworks: use u32 type for be32_to_cpup() macro
ALSA: bebob: use correct type for __be32 data
Tero Kristo (1):
rtc: ds1307: Fix alarm programming for mcp794xx
Tiffany Lin (1):
[media] media: vb2 dma-contig: Fully cache synchronise buffers in prepare and finish
Tony Lindgren (1):
mfd: twl6040: Fix deferred probe handling for clk32k
Valentin Rothberg (1):
wm831x_power: Use IRQF_ONESHOT to request threaded IRQs
Vignesh R (1):
spi: ti-qspi: Fix data corruption seen on r/w stress test
Vineet Gupta (1):
MAINTAINERS: Add public mailing list for ARC
Yinghai Lu (1):
mm: Check if section present during memory block (un)registering
Yuchung Cheng (1):
tcp: apply Kern's check on RTTs used for congestion control
libin (1):
recordmcount: Fix endianness handling bug for nop_mcount
sumit.saxena@avagotech.com (2):
megaraid_sas: Do not use PAGE_SIZE for max_sectors
megaraid_sas : SMAP restriction--do not access user memory from IOCTL code
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Luis Henriques <luis.henriques@canonical.com> |
|---|---|
| Date | 2015-12-09 11:50 +0100 |
| Subject | [PATCH 3.16.y-ckt 011/126] net: avoid NULL deref in inet_ctl_sock_destroy() |
| Message-ID | <qDKtR-7f3-37@gated-at.bofh.it> |
| In reply to | #1287405 |
3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <edumazet@google.com>
commit 8fa677d2706d325d71dab91bf6e6512c05214e37 upstream.
Under low memory conditions, tcp_sk_init() and icmp_sk_init()
can both iterate on all possible cpus and call inet_ctl_sock_destroy(),
with eventual NULL pointer.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
include/net/inet_common.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index fe7994c48b75..fd1da045dabc 100644
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -40,7 +40,8 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family,
static inline void inet_ctl_sock_destroy(struct sock *sk)
{
- sk_release_kernel(sk);
+ if (sk)
+ sk_release_kernel(sk);
}
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Luis Henriques <luis.henriques@canonical.com> |
|---|---|
| Date | 2015-12-09 11:50 +0100 |
| Subject | [PATCH 3.16.y-ckt 005/126] stmmac: Correctly report PTP capabilities. |
| Message-ID | <qDKtR-7f3-39@gated-at.bofh.it> |
| In reply to | #1287405 |
3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Reid <preid@electromag.com.au>
commit e6dbe1eb2db0d7a14991c06278dd3030c45fb825 upstream.
priv->hwts_*_en indicate if timestamping is enabled/disabled at run
time. But priv->dma_cap.time_stamp and priv->dma_cap.atime_stamp
indicates HW is support for PTPv1/PTPv2.
Signed-off-by: Phil Reid <preid@electromag.com.au>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index c62e67f3c2f0..aa0480402c97 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -723,10 +723,13 @@ static int stmmac_get_ts_info(struct net_device *dev,
{
struct stmmac_priv *priv = netdev_priv(dev);
- if ((priv->hwts_tx_en) && (priv->hwts_rx_en)) {
+ if ((priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp)) {
- info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
+ info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
+ SOF_TIMESTAMPING_TX_HARDWARE |
+ SOF_TIMESTAMPING_RX_SOFTWARE |
SOF_TIMESTAMPING_RX_HARDWARE |
+ SOF_TIMESTAMPING_SOFTWARE |
SOF_TIMESTAMPING_RAW_HARDWARE;
if (priv->ptp_clock)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Luis Henriques <luis.henriques@canonical.com> |
|---|---|
| Date | 2015-12-09 11:50 +0100 |
| Subject | [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx |
| Message-ID | <qDKtR-7f3-43@gated-at.bofh.it> |
| In reply to | #1287405 |
3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
commit 0db65fcfcded76fe4f74e3ca9f4e2baf67b683ef upstream.
New device IDs shamelessly lifted from the vendor driver.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
drivers/net/usb/qmi_wwan.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index b8a82b86f909..f5a0e1034de9 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -760,6 +760,10 @@ static const struct usb_device_id products[] = {
{QMI_FIXED_INTF(0x1199, 0x9056, 8)}, /* Sierra Wireless Modem */
{QMI_FIXED_INTF(0x1199, 0x9057, 8)},
{QMI_FIXED_INTF(0x1199, 0x9061, 8)}, /* Sierra Wireless Modem */
+ {QMI_FIXED_INTF(0x1199, 0x9070, 8)}, /* Sierra Wireless MC74xx/EM74xx */
+ {QMI_FIXED_INTF(0x1199, 0x9070, 10)}, /* Sierra Wireless MC74xx/EM74xx */
+ {QMI_FIXED_INTF(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx/EM74xx */
+ {QMI_FIXED_INTF(0x1199, 0x9071, 10)}, /* Sierra Wireless MC74xx/EM74xx */
{QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
{QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */
{QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Bjørn Mork <bjorn@mork.no> |
|---|---|
| Date | 2015-12-09 12:30 +0100 |
| Subject | Re: [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx |
| Message-ID | <qDL6y-7It-5@gated-at.bofh.it> |
| In reply to | #1287408 |
Luis Henriques <luis.henriques@canonical.com> writes:
> 3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
>
> commit 0db65fcfcded76fe4f74e3ca9f4e2baf67b683ef upstream.
>
> New device IDs shamelessly lifted from the vendor driver.
>
> Signed-off-by: Bjørn Mork <bjorn@mork.no>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
> ---
> drivers/net/usb/qmi_wwan.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
> index b8a82b86f909..f5a0e1034de9 100644
> --- a/drivers/net/usb/qmi_wwan.c
> +++ b/drivers/net/usb/qmi_wwan.c
> @@ -760,6 +760,10 @@ static const struct usb_device_id products[] = {
> {QMI_FIXED_INTF(0x1199, 0x9056, 8)}, /* Sierra Wireless Modem */
> {QMI_FIXED_INTF(0x1199, 0x9057, 8)},
> {QMI_FIXED_INTF(0x1199, 0x9061, 8)}, /* Sierra Wireless Modem */
> + {QMI_FIXED_INTF(0x1199, 0x9070, 8)}, /* Sierra Wireless MC74xx/EM74xx */
> + {QMI_FIXED_INTF(0x1199, 0x9070, 10)}, /* Sierra Wireless MC74xx/EM74xx */
> + {QMI_FIXED_INTF(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx/EM74xx */
> + {QMI_FIXED_INTF(0x1199, 0x9071, 10)}, /* Sierra Wireless MC74xx/EM74xx */
> {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
> {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */
> {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */
Please drop this patch. More substantial changes were needed to support
this modem.
Bjørn
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Luis Henriques <luis.henriques@canonical.com> |
|---|---|
| Date | 2015-12-09 12:50 +0100 |
| Subject | Re: [PATCH 3.16.y-ckt 002/126] qmi_wwan: add Sierra Wireless MC74xx/EM74xx |
| Message-ID | <qDLpU-7QD-11@gated-at.bofh.it> |
| In reply to | #1287425 |
On Wed, Dec 09, 2015 at 12:27:42PM +0100, Bjørn Mork wrote:
> Luis Henriques <luis.henriques@canonical.com> writes:
>
> > 3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
> >
> > commit 0db65fcfcded76fe4f74e3ca9f4e2baf67b683ef upstream.
> >
> > New device IDs shamelessly lifted from the vendor driver.
> >
> > Signed-off-by: Bjørn Mork <bjorn@mork.no>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> > Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
> > ---
> > drivers/net/usb/qmi_wwan.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
> > index b8a82b86f909..f5a0e1034de9 100644
> > --- a/drivers/net/usb/qmi_wwan.c
> > +++ b/drivers/net/usb/qmi_wwan.c
> > @@ -760,6 +760,10 @@ static const struct usb_device_id products[] = {
> > {QMI_FIXED_INTF(0x1199, 0x9056, 8)}, /* Sierra Wireless Modem */
> > {QMI_FIXED_INTF(0x1199, 0x9057, 8)},
> > {QMI_FIXED_INTF(0x1199, 0x9061, 8)}, /* Sierra Wireless Modem */
> > + {QMI_FIXED_INTF(0x1199, 0x9070, 8)}, /* Sierra Wireless MC74xx/EM74xx */
> > + {QMI_FIXED_INTF(0x1199, 0x9070, 10)}, /* Sierra Wireless MC74xx/EM74xx */
> > + {QMI_FIXED_INTF(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx/EM74xx */
> > + {QMI_FIXED_INTF(0x1199, 0x9071, 10)}, /* Sierra Wireless MC74xx/EM74xx */
> > {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
> > {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */
> > {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */
>
>
> Please drop this patch. More substantial changes were needed to support
> this modem.
>
>
> Bjørn
Thank you, I've dropped it from the 3.16 queue.
Cheers,
--
Luís
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web