Linux 4.4.69
Greg KH
maintainerI'm announcing the release of the 4.4.69 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.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/arm/kvm/psci.c | 8 arch/arm64/kvm/sys_regs.c | 6 arch/x86/boot/boot.h | 2 arch/x86/include/asm/pmem.h | 2 arch/x86/kvm/x86.c | 12 + arch/x86/um/ptrace_64.c | 2 arch/x86/xen/mmu.c | 7 block/blk-integrity.c | 3 crypto/algif_aead.c | 157 +++++++++++++++++- drivers/Makefile | 1 drivers/bluetooth/hci_bcm.c | 5 drivers/bluetooth/hci_intel.c | 13 + drivers/char/ipmi/ipmi_ssif.c | 4 drivers/infiniband/core/sysfs.c | 2 drivers/infiniband/hw/mlx4/main.c | 1 drivers/infiniband/hw/mlx4/mcg.c | 3 drivers/infiniband/ulp/ipoib/ipoib_fs.c | 3 drivers/infiniband/ulp/ipoib/ipoib_main.c | 44 ++++- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 3 drivers/md/dm-era-target.c | 8 drivers/net/wireless/ath/ath10k/mac.c | 7 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 drivers/net/wireless/ath/ath9k/main.c | 8 drivers/net/wireless/ath/carl9170/main.c | 8 drivers/net/wireless/ath/wcn36xx/main.c | 8 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 8 drivers/net/wireless/cw1200/sta.c | 4 drivers/net/wireless/cw1200/sta.h | 4 drivers/net/wireless/iwlegacy/4965-mac.c | 8 drivers/net/wireless/iwlegacy/4965.h | 4 drivers/net/wireless/iwlwifi/dvm/mac80211.c | 9 - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 9 - drivers/net/wireless/mac80211_hwsim.c | 8 drivers/net/wireless/mediatek/mt7601u/main.c | 8 drivers/net/wireless/mwl8k.c | 10 - drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 6 drivers/net/wireless/realtek/rtlwifi/core.c | 8 drivers/net/wireless/rsi/rsi_91x_mac80211.c | 19 -- drivers/net/wireless/rt2x00/rt2800lib.c | 7 drivers/net/wireless/rt2x00/rt2800lib.h | 4 drivers/net/wireless/ti/wl18xx/event.c | 28 +++ drivers/net/wireless/ti/wl18xx/event.h | 1 drivers/net/wireless/ti/wl18xx/main.c | 3 drivers/net/wireless/ti/wlcore/acx.c | 5 drivers/net/wireless/ti/wlcore/acx.h | 3 drivers/net/wireless/ti/wlcore/main.c | 14 + drivers/staging/comedi/drivers/jr3_pci.c | 13 - drivers/staging/gdm724x/gdm_mux.c | 4 drivers/staging/vt6656/usbpipe.c | 31 +++ drivers/target/iscsi/iscsi_target.c | 1 drivers/target/iscsi/iscsi_target_configfs.c | 30 --- drivers/target/iscsi/iscsi_target_login.c | 1 drivers/target/iscsi/iscsi_target_tpg.c | 10 - drivers/target/iscsi/iscsi_target_tpg.h | 2 drivers/target/target_core_file.c | 3 drivers/target/target_core_sbc.c | 5 drivers/target/target_core_tpg.c | 152 +++++------------ drivers/target/target_core_transport.c | 4 drivers/tty/pty.c | 7 drivers/tty/serial/omap-serial.c | 9 - drivers/tty/serial/samsung.c | 9 - drivers/usb/core/driver.c | 21 ++ drivers/usb/core/file.c | 9 - drivers/usb/core/hub.c | 11 + drivers/usb/host/xhci-mem.c | 2 drivers/usb/misc/usbtest.c | 1 drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 6 drivers/vfio/vfio_iommu_type1.c | 102 ++++------- fs/block_dev.c | 11 - fs/ceph/xattr.c | 3 fs/cifs/cifs_unicode.c | 6 fs/cifs/cifs_unicode.h | 5 fs/cifs/cifssmb.c | 3 fs/cifs/ioctl.c | 2 fs/cifs/smb2pdu.c | 14 + fs/ext4/inode.c | 5 fs/xattr.c | 2 include/net/mac80211.h | 48 ++++- include/target/target_core_fabric.h | 5 kernel/padata.c | 2 net/bluetooth/hci_sock.c | 3 net/mac80211/agg-rx.c | 32 ++- net/mac80211/agg-tx.c | 53 ++++-- net/mac80211/driver-ops.c | 10 - net/mac80211/driver-ops.h | 4 net/mac80211/sta_info.c | 3 net/mac80211/trace.h | 43 ++-- tools/testing/selftests/x86/ldt_gdt.c | 46 +++++ 90 files changed, 796 insertions(+), 434 deletions(-)
Ajay Kaher (1):
USB: Proper handling of Race Condition when two USB class drivers try to call init_usb_class simultaneously
Alex Williamson (1):
vfio/type1: Remove locked page accounting workqueue
Alexey Brodkin (1):
usb: Make sure usb/phy/of gets built-in
Andrew Jones (1):
KVM: arm/arm64: fix races in kvm_psci_vcpu_on
Andrey Ryabinin (1):
fs/block_dev: always invalidate cleancache in invalidate_bdev()
Andy Lutomirski (1):
selftests/x86/ldt_gdt_32: Work around a glibc sigaction() bug
Ashish Kalra (1):
x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup
Bart Van Assche (1):
target/fileio: Fix zero-length READ and WRITE handling
Ben Hutchings (1):
x86, pmem: Fix cache flushing for iovec write < 8 bytes
Björn Jacke (2):
CIFS: fix mapping of SFM_SPACE and SFM_PERIOD
CIFS: add misssing SFM mapping for doublequote
David Disseldorp (1):
cifs: fix CIFS_IOC_GET_MNT_INFO oops
David Hildenbrand (1):
KVM: x86: fix user triggerable warning in kvm_apic_accept_events()
Eric Biggers (1):
ext4: evict inline data when writing to memory map
Greg Kroah-Hartman (1):
Linux 4.4.69
Guenter Roeck (2):
usb: hub: Fix error loop seen after hub communication errors
usb: hub: Do not attempt to autosuspend disconnected devices
Gustavo A. R. Silva (1):
usb: misc: add missing continue in switch
Ian Abbott (2):
staging: comedi: jr3_pci: fix possible null pointer dereference
staging: comedi: jr3_pci: cope with jiffies wraparound
Jack Morgenstein (3):
IB/core: Fix sysfs registration error flow
IB/mlx4: Fix ib device initialization error flow
IB/mlx4: Reduce SRIOV multicast cleanup warning message to debug level
Jason A. Donenfeld (1):
padata: free correct variable
Joeseph Chang (1):
ipmi: Fix kernel panic at ipmi_ssif_thread()
Johan Hovold (5):
staging: gdm724x: gdm_mux: fix use-after-free on module unload
serial: omap: fix runtime-pm handling on unbind
serial: omap: suspend device on probe errors
Bluetooth: hci_bcm: add missing tty-device sanity check
Bluetooth: hci_intel: add missing tty-device sanity check
Juergen Gross (1):
xen: adjust early dom0 p2m handling to xen hypervisor behavior
Luis Henriques (1):
ceph: fix memory leak in __ceph_setxattr()
Malcolm Priestley (2):
staging: vt6656: use off stack for in buffer USB transfers.
staging: vt6656: use off stack for out buffer USB transfers.
Marc Zyngier (1):
arm64: KVM: Fix decoding of Rt/Rt2 when trapping AArch32 CP accesses
Marek Szyprowski (1):
serial: samsung: Use right device for DMA-mapping calls
Marek Vasut (1):
USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit
Maxim Altshul (3):
mac80211: RX BA support for sta max_rx_aggregation_subframes
wlcore: Pass win_size taken from ieee80211_sta to FW
wlcore: Add RX_BA_WIN_SIZE_CHANGE_EVENT event
Michal Hocko (1):
fs/xattr.c: zero out memory copied to userspace in getxattr
Mike Snitzer (1):
block: fix blk_integrity_register to use template's interval_exp if not 0
Nicholas Bellinger (3):
target: Fix compare_and_write_callback handling for non GOOD status
target: Convert ACL change queue_depth se_session reference usage
iscsi-target: Set session_fall_back_to_erl0 when forcing reinstatement
Peter Chen (1):
usb: host: xhci: print correct command ring address
Richard Weinberger (1):
um: Fix PTRACE_POKEUSER on x86_64
Sara Sharon (2):
mac80211: pass RX aggregation window size to driver
mac80211: pass block ack session timeout to to driver
Shamir Rabinovitch (1):
IB/IPoIB: ibX: failed to create mcg debug file
Somasundaram Krishnasamy (1):
dm era: save spacemap metadata root after the pre-commit
Stephan Mueller (1):
crypto: algif_aead - Require setkey before accept(2)
Steve French (2):
Set unicode flag on cifs echo request to avoid Mac error
SMB3: Work around mount failure when using SMB3 dialect to Macs
Szymon Janc (1):
Bluetooth: Fix user channel for 32bit userspace on 64bit kernel
Wang YanQing (1):
tty: pty: Fix ldisc flush after userspace become aware of the data already
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 68 +SUBLEVEL = 69 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arm/kvm/psci.c +7 -1
@@ -208,9 +208,10 @@ int kvm_psci_version(struct kvm_vcpu *vcpu)static int kvm_psci_0_2_call (struct kvm_vcpu *vcpu) { -int ret =1 ; +struct kvm *kvm = vcpu->kvm;unsigned long psci_fn =vcpu_get_reg (vcpu,0 ) & ~((u32 )0 );unsigned long val; +int ret =1 ;switch (psci_fn) {case PSCI_0_2_FN_PSCI_VERSION :
@@ -230,7 +231,9 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)break ;case PSCI_0_2_FN_CPU_ON :case PSCI_0_2_FN64_CPU_ON : +mutex_lock (&kvm->lock); val =kvm_psci_vcpu_on (vcpu); +mutex_unlock (&kvm->lock);break ;case PSCI_0_2_FN_AFFINITY_INFO :case PSCI_0_2_FN64_AFFINITY_INFO :
@@ -279,6 +282,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)static int kvm_psci_0_1_call (struct kvm_vcpu *vcpu) { +struct kvm *kvm = vcpu->kvm;unsigned long psci_fn =vcpu_get_reg (vcpu,0 ) & ~((u32 )0 );unsigned long val;
@@ -288,7 +292,9 @@ static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu) val =PSCI_RET_SUCCESS ;break ;case KVM_PSCI_FN_CPU_ON : +mutex_lock (&kvm->lock); val =kvm_psci_vcpu_on (vcpu); +mutex_unlock (&kvm->lock);break ;default : val =PSCI_RET_NOT_SUPPORTED ;
arch/arm64/kvm/sys_regs.c +3 -3
@@ -1054,8 +1054,8 @@ static int kvm_handle_cp_64(struct kvm_vcpu *vcpu, {struct sys_reg_params params;u32 hsr =kvm_vcpu_get_hsr (vcpu); -int Rt = (hsr >>5 ) &0xf ; -int Rt2 = (hsr >>10 ) &0xf ; +int Rt = (hsr >>5 ) &0x1f ; +int Rt2 = (hsr >>10 ) &0x1f ; params.is_aarch32 = true; params.is_32bit = false;
@@ -1106,7 +1106,7 @@ static int kvm_handle_cp_32(struct kvm_vcpu *vcpu, {struct sys_reg_params params;u32 hsr =kvm_vcpu_get_hsr (vcpu); -int Rt = (hsr >>5 ) &0xf ; +int Rt = (hsr >>5 ) &0x1f ; params.is_aarch32 = true; params.is_32bit = true;
arch/x86/boot/boot.h +1 -1
@@ -16,7 +16,7 @@#ifndef BOOT_BOOT_H #define BOOT_BOOT_H -#define STACK_SIZE 512/* Minimum number of bytes for stack */ +#define STACK_SIZE 1024/* Minimum number of bytes for stack */ #ifndef __ASSEMBLY__
arch/x86/include/asm/pmem.h +1 -1
@@ -122,7 +122,7 @@ static inline size_t arch_copy_from_iter_pmem(void __pmem *addr, size_t bytes,if (bytes <8 ) {if (!IS_ALIGNED (dest,4 ) || (bytes !=4 )) -__arch_wb_cache_pmem (addr,1 ); +__arch_wb_cache_pmem (addr, bytes); }else {if (!IS_ALIGNED (dest,8 )) { dest =ALIGN (dest, boot_cpu_data.x86_clflush_size);
arch/x86/kvm/x86.c +12 -0
@@ -2960,6 +2960,12 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu, | KVM_VCPUEVENT_VALID_SMM))return -EINVAL ; +/* INITs are latched while in SMM */ +if (events->flags &KVM_VCPUEVENT_VALID_SMM && + (events->smi.smm || events->smi.pending) && + vcpu->arch.mp_state ==KVM_MP_STATE_INIT_RECEIVED ) +return -EINVAL ; +process_nmi (vcpu); vcpu->arch.exception.pending = events->exception.injected; vcpu->arch.exception.nr = events->exception.nr;
@@ -6993,6 +6999,12 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, mp_state->mp_state != KVM_MP_STATE_RUNNABLE)return -EINVAL ; +/* INITs are latched while in SMM */ +if ((is_smm (vcpu) || vcpu->arch.smi_pending) && + (mp_state->mp_state ==KVM_MP_STATE_SIPI_RECEIVED || + mp_state->mp_state ==KVM_MP_STATE_INIT_RECEIVED )) +return -EINVAL ; +if (mp_state->mp_state ==KVM_MP_STATE_SIPI_RECEIVED ) { vcpu->arch.mp_state =KVM_MP_STATE_INIT_RECEIVED ;set_bit (KVM_APIC_SIPI , &vcpu->arch.apic->pending_events);
arch/x86/um/ptrace_64.c +1 -1
@@ -121,7 +121,7 @@ int poke_user(struct task_struct *child, long addr, long data) else if ((addr >= offsetof(struct user, u_debugreg[0])) && (addr <= offsetof(struct user, u_debugreg[7]))) { addr -= offsetof(struct user, u_debugreg[0]); - addr = addr >>2 ; + addr = addr >>3 ;if ((addr ==4 ) || (addr ==5 ))return -EIO ; child->thread.arch.debugregs[addr] = data;
arch/x86/xen/mmu.c +4 -3
@@ -2038,7 +2038,8 @@ static unsigned long __init xen_read_phys_ulong(phys_addr_t addr)/* * Translate a virtual address to a physical one without relying on mapped -* page tables. +* page tables. Don't rely on big pages being aligned in (guest) physical +* space! */ static phys_addr_t __init xen_early_virt_to_phys (unsigned long vaddr) {
@@ -2059,7 +2060,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pud)));if (!pud_present (pud))return 0 ; - pa =pud_pfn (pud) <<PAGE_SHIFT ; + pa =pud_val (pud) &PTE_PFN_MASK ;if (pud_large (pud))return pa + (vaddr & ~PUD_MASK );
@@ -2067,7 +2068,7 @@ static phys_addr_t __init xen_early_virt_to_phys(unsigned long vaddr) sizeof(pmd)));if (!pmd_present (pmd))return 0 ; - pa =pmd_pfn (pmd) <<PAGE_SHIFT ; + pa =pmd_val (pmd) &PTE_PFN_MASK ;if (pmd_large (pmd))return pa + (vaddr & ~PMD_MASK );
block/blk-integrity.c +2 -1
@@ -412,7 +412,8 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template bi->flags =BLK_INTEGRITY_VERIFY |BLK_INTEGRITY_GENERATE | template->flags; - bi->interval_exp =ilog2 (queue_logical_block_size (disk->queue)); + bi->interval_exp = template->interval_exp ? : +ilog2 (queue_logical_block_size (disk->queue)); bi->profile = template->profile ? template->profile : &nop_profile; bi->tuple_size = template->tuple_size; bi->tag_size = template->tag_size;
crypto/algif_aead.c +149 -8
211 lines not on this page · raw message
drivers/Makefile +1 -0
@@ -98,6 +98,7 @@ obj-$(CONFIG_USB_PHY) += usb/ obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_PCI) += usb/ obj-$(CONFIG_USB_GADGET) += usb/ +obj-$(CONFIG_OF) += usb/ obj-$(CONFIG_SERIO) += input/serio/ obj-$(CONFIG_GAMEPORT) += input/gameport/ obj-$(CONFIG_INPUT) += input/
drivers/bluetooth/hci_bcm.c +4 -1
@@ -287,6 +287,9 @@ static int bcm_open(struct hci_uart *hu) hu->priv = bcm; +if (!hu->tty->dev) + goto out; +mutex_lock (&bcm_device_lock);list_for_each (p, &bcm_device_list) { struct bcm_device *dev = list_entry(p, struct bcm_device, list);
@@ -307,7 +310,7 @@ static int bcm_open(struct hci_uart *hu) }mutex_unlock (&bcm_device_lock); - +out:return 0 ; }
drivers/bluetooth/hci_intel.c +12 -1
@@ -307,6 +307,9 @@ static int intel_set_power(struct hci_uart *hu, bool powered)struct list_head *p;int err = -ENODEV ; +if (!hu->tty->dev) +return err; +mutex_lock (&intel_device_list_lock);list_for_each (p, &intel_device_list) {
@@ -379,6 +382,9 @@ static void intel_busy_work(struct work_struct *work) struct intel_data *intel = container_of(work, struct intel_data, busy_work); +if (!intel->hu->tty->dev) +return ; +/* Link is busy, delay the suspend */ mutex_lock (&intel_device_list_lock);list_for_each (p, &intel_device_list) {
@@ -913,6 +919,8 @@ done:list_for_each (p, &intel_device_list) { struct intel_device *dev = list_entry(p, struct intel_device, list); +if (!hu->tty->dev) +break ;if (hu->tty->dev->parent == dev->pdev->dev.parent) {if (device_may_wakeup (&dev->pdev->dev)) idev = dev;
@@ -1094,6 +1102,9 @@ static int intel_enqueue(struct hci_uart *hu, struct sk_buff *skb)BT_DBG ("hu %p skb %p" , hu, skb); +if (!hu->tty->dev) + goto out_enqueue; +/* Be sure our controller is resumed and potential LPM transaction * completed before enqueuing any packet. */
@@ -1110,7 +1121,7 @@ static int intel_enqueue(struct hci_uart *hu, struct sk_buff *skb) } }mutex_unlock (&intel_device_list_lock); - +out_enqueue:skb_queue_tail (&intel->txq, skb);return 0 ;
drivers/char/ipmi/ipmi_ssif.c +3 -1
@@ -888,6 +888,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,* for details on the intricacies of this. */ int left; +unsigned char *data_to_send;ssif_inc_stat (ssif_info, sent_messages_parts);
@@ -896,6 +897,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, left =32 ;/* Length byte. */ ssif_info->multi_data[ssif_info->multi_pos] = left; + data_to_send = ssif_info->multi_data + ssif_info->multi_pos; ssif_info->multi_pos += left;if (left <32 )/*
@@ -909,7 +911,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, rv =ssif_i2c_send (ssif_info, msg_written_handler,I2C_SMBUS_WRITE ,SSIF_IPMI_MULTI_PART_REQUEST_MIDDLE , - ssif_info->multi_data + ssif_info->multi_pos, + data_to_send,I2C_SMBUS_BLOCK_DATA );if (rv <0 ) {/* request failed, just return the error. */
drivers/infiniband/core/sysfs.c +1 -1
@@ -863,7 +863,7 @@ err_put:free_port_list_attributes (device); err_unregister: -device_unregister (class_dev); +device_del (class_dev); err:return ret;
drivers/infiniband/hw/mlx4/main.c +1 -0
@@ -2491,6 +2491,7 @@ err_counter:mlx4_ib_delete_counters_table (ibdev, &ibdev->counters_table[i]); err_map: +mlx4_ib_free_eqs (dev, ibdev);iounmap (ibdev->uar_map); err_uar:
drivers/infiniband/hw/mlx4/mcg.c +2 -1
@@ -1105,7 +1105,8 @@ static void _mlx4_ib_mcg_port_cleanup(struct mlx4_ib_demux_ctx *ctx, int destroywhile ((p =rb_first (&ctx->mcg_table)) !=NULL ) { group = rb_entry(p, struct mcast_group, node);if (atomic_read (&group->refcount)) -mcg_warn_group (group,"group refcount %d!!! (pointer %p)\n" ,atomic_read (&group->refcount), group); +mcg_debug_group (group,"group refcount %d!!! (pointer %p)\n" , +atomic_read (&group->refcount), group);force_clean_group (group); }
drivers/infiniband/ulp/ipoib/ipoib_fs.c +3 -0
@@ -281,8 +281,11 @@ void ipoib_delete_debug_files(struct net_device *dev) {struct ipoib_dev_priv *priv =netdev_priv (dev); +WARN_ONCE (!priv->mcg_dentry,"null mcg debug file\n" ); +WARN_ONCE (!priv->path_dentry,"null path debug file\n" );debugfs_remove (priv->mcg_dentry);debugfs_remove (priv->path_dentry); + priv->mcg_dentry = priv->path_dentry =NULL ; }int ipoib_register_debugfs (void )
drivers/infiniband/ulp/ipoib/ipoib_main.c +39 -5
86 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib_vlan.c +0 -3
@@ -85,8 +85,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, goto register_failed; } -ipoib_create_debug_files (priv->dev); -/* RTNL childs don't need proprietary sysfs entries */ if (type ==IPOIB_LEGACY_CHILD ) {if (ipoib_cm_add_mode_attr (priv->dev))
@@ -107,7 +105,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, sysfs_failed: result = -ENOMEM ; -ipoib_delete_debug_files (priv->dev);unregister_netdevice (priv->dev); register_failed:
drivers/md/dm-era-target.c +4 -4
@@ -961,15 +961,15 @@ static int metadata_commit(struct era_metadata *md) } } - r =save_sm_root (md); + r =dm_tm_pre_commit (md->tm);if (r) { -DMERR ("%s: save_sm_root failed" , __func__); +DMERR ("%s: pre commit failed" , __func__);return r; } - r =dm_tm_pre_commit (md->tm); + r =save_sm_root (md);if (r) { -DMERR ("%s: pre commit failed" , __func__); +DMERR ("%s: save_sm_root failed" , __func__);return r; }
drivers/net/wireless/ath/ath10k/mac.c +4 -3
@@ -6351,12 +6351,13 @@ static u64 ath10k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)static int ath10k_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct ath10k *ar = hw->priv;struct ath10k_vif *arvif =ath10k_vif_to_arvif (vif); +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid;ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac ampdu vdev_id %i sta %pM tid %hu action %d\n" , arvif->vdev_id, sta->addr, tid, action);
drivers/net/wireless/ath/ath9k/htc_drv_main.c +4 -3
@@ -1657,13 +1657,14 @@ static void ath9k_htc_reset_tsf(struct ieee80211_hw *hw,static int ath9k_htc_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta, -u16 tid,u16 *ssn,u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct ath9k_htc_priv *priv = hw->priv;struct ath9k_htc_sta *ista;int ret =0 ; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid;mutex_lock (&priv->mutex);ath9k_htc_ps_wakeup (priv);
drivers/net/wireless/ath/ath9k/main.c +5 -3
@@ -1855,14 +1855,16 @@ static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)static int ath9k_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta, -u16 tid,u16 *ssn,u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct ath_softc *sc = hw->priv;struct ath_common *common =ath9k_hw_common (sc->sc_ah);bool flush = false;int ret =0 ; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn;mutex_lock (&sc->mutex);
drivers/net/wireless/ath/carl9170/main.c +5 -3
@@ -1413,10 +1413,12 @@ static void carl9170_ampdu_work(struct work_struct *work)static int carl9170_op_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta, -u16 tid,u16 *ssn,u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) { +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn;struct ar9170 *ar = hw->priv;struct carl9170_sta_info *sta_info = (void *) sta->drv_priv;struct carl9170_sta_tid *tid_info;
drivers/net/wireless/ath/wcn36xx/main.c +5 -3
@@ -857,12 +857,14 @@ static int wcn36xx_resume(struct ieee80211_hw *hw)static int wcn36xx_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct wcn36xx *wcn = hw->priv;struct wcn36xx_sta *sta_priv =NULL ; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn;wcn36xx_dbg (WCN36XX_DBG_MAC ,"mac ampdu action action %d tid %d\n" , action, tid);
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +5 -3
@@ -818,13 +818,15 @@ brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,static int brcms_ops_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct brcms_info *wl = hw->priv;struct scb *scb = &wl->wlc->pri_scb;int status; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u8 buf_size = params->buf_size;if (WARN_ON (scb->magic !=SCB_MAGIC ))return -EIDRM ;
drivers/net/wireless/cw1200/sta.c +1 -3
@@ -2135,9 +2135,7 @@ void cw1200_mcast_timeout(unsigned long arg)int cw1200_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {/* Aggregation is implemented fully in firmware, * including block ack negotiation. Do not allow
drivers/net/wireless/cw1200/sta.h +1 -3
@@ -109,9 +109,7 @@ void cw1200_bss_info_changed(struct ieee80211_hw *dev, u32 changed);int cw1200_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu); +struct ieee80211_ampdu_params *params);void cw1200_suspend_resume (struct cw1200_common *priv,struct wsm_suspend_resume *arg);
drivers/net/wireless/iwlegacy/4965-mac.c +5 -3
@@ -5982,12 +5982,14 @@ il4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,int il4965_mac_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 * ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct il_priv *il = hw->priv;int ret = -EINVAL ; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn;D_HT ("A-MPDU action on addr %pM tid %d\n" , sta->addr, tid);
drivers/net/wireless/iwlegacy/4965.h +1 -3
@@ -182,9 +182,7 @@ void il4965_mac_update_tkip_key(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u32 iv32, u16 *phase1key);int il4965_mac_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 * ssn, -u8 buf_size,bool amsdu); +struct ieee80211_ampdu_params *params);int il4965_mac_sta_add (struct ieee80211_hw *hw,struct ieee80211_vif *vif,struct ieee80211_sta *sta);void
drivers/net/wireless/iwlwifi/dvm/mac80211.c +6 -3
@@ -729,12 +729,15 @@ static inline bool iwl_enable_tx_ampdu(const struct iwl_cfg *cfg)static int iwlagn_mac_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct iwl_priv *priv =IWL_MAC80211_GET_DVM (hw);int ret = -EINVAL ; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn; +u8 buf_size = params->buf_size;struct iwl_station_priv *sta_priv = (void *) sta->drv_priv; IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
drivers/net/wireless/iwlwifi/mvm/mac80211.c +6 -3
@@ -826,13 +826,16 @@ iwl_mvm_ampdu_check_trigger(struct iwl_mvm *mvm, struct ieee80211_vif *vif,static int iwl_mvm_mac_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid, -u16 *ssn,u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct iwl_mvm *mvm =IWL_MAC80211_GET_MVM (hw);int ret;bool tx_agg_ref = false; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn; +u8 buf_size = params->buf_size;IWL_DEBUG_HT (mvm,"A-MPDU action on addr %pM tid %d: action %d\n" , sta->addr, tid, action);
drivers/net/wireless/mac80211_hwsim.c +5 -3
@@ -1817,10 +1817,12 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw,static int mac80211_hwsim_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) { +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +switch (action) {case IEEE80211_AMPDU_TX_START :ieee80211_start_tx_ba_cb_irqsafe (vif, sta->addr, tid);
drivers/net/wireless/mediatek/mt7601u/main.c +5 -3
@@ -334,11 +334,13 @@ static int mt7601u_set_rts_threshold(struct ieee80211_hw *hw, u32 value)static int mt76_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn,u8 buf_size, -bool amsdu) +struct ieee80211_ampdu_params *params) {struct mt7601u_dev *dev = hw->priv; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn;struct mt76_sta *msta = (struct mt76_sta *) sta->drv_priv;WARN_ON (msta->wcid.idx >GROUP_WCID (0 ));
drivers/net/wireless/mwl8k.c +6 -4
@@ -5421,11 +5421,13 @@ static int mwl8k_get_survey(struct ieee80211_hw *hw, int idx,static int mwl8k_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) { - +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn; +u8 buf_size = params->buf_size;int i, rc =0 ;struct mwl8k_priv *priv = hw->priv;struct mwl8k_ampdu_stream *stream;
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c +3 -3
@@ -5375,13 +5375,13 @@ static int rtl8xxxu_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,static int rtl8xxxu_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn,u8 buf_size, -bool amsdu) +struct ieee80211_ampdu_params *params) {struct rtl8xxxu_priv *priv = hw->priv;struct device *dev = &priv->udev->dev;u8 ampdu_factor, ampdu_density; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action;switch (action) {case IEEE80211_AMPDU_TX_START :
drivers/net/wireless/realtek/rtlwifi/core.c +5 -3
@@ -1369,11 +1369,13 @@ static void rtl_op_sta_notify(struct ieee80211_hw *hw,static int rtl_op_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct rtl_priv *rtlpriv =rtl_priv (hw); +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn;switch (action) {case IEEE80211_AMPDU_TX_START :
drivers/net/wireless/rsi/rsi_91x_mac80211.c +7 -12
@@ -659,29 +659,24 @@ static int rsi_mac80211_set_key(struct ieee80211_hw *hw,* informs the f/w regarding this. * @hw: Pointer to the ieee80211_hw structure. * @vif: Pointer to the ieee80211_vif structure. -* @action: ieee80211_ampdu_mlme_action enum. -* @sta: Pointer to the ieee80211_sta structure. -* @tid: Traffic identifier. -* @ssn: Pointer to ssn value. -* @buf_size: Buffer size (for kernel version > 2.6.38). -* @amsdu: is AMSDU in AMPDU allowed +* @params: Pointer to A-MPDU action parameters * * Return: status: 0 on success, negative error code on failure. */ static int rsi_mac80211_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta, -unsigned short tid, -unsigned short *ssn, -unsigned char buf_size, -bool amsdu) +struct ieee80211_ampdu_params *params) {int status = -EOPNOTSUPP ;struct rsi_hw *adapter = hw->priv;struct rsi_common *common = adapter->priv;u16 seq_no =0 ;u8 ii =0 ; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn; +u8 buf_size = params->buf_size;for (ii =0 ; ii <RSI_MAX_VIFS ; ii++) {if (vif == adapter->vifs[ii])
drivers/net/wireless/rt2x00/rt2800lib.c +4 -3
@@ -7935,10 +7935,11 @@ u64 rt2800_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)EXPORT_SYMBOL_GPL (rt2800_get_tsf);int rt2800_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) { +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid;struct rt2x00_sta *sta_priv = (struct rt2x00_sta *)sta->drv_priv;int ret =0 ;
drivers/net/wireless/rt2x00/rt2800lib.h +1 -3
@@ -218,9 +218,7 @@ int rt2800_conf_tx(struct ieee80211_hw *hw, const struct ieee80211_tx_queue_params *params);u64 rt2800_get_tsf (struct ieee80211_hw *hw,struct ieee80211_vif *vif);int rt2800_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu); +struct ieee80211_ampdu_params *params);int rt2800_get_survey (struct ieee80211_hw *hw,int idx,struct survey_info *survey);void rt2800_disable_wpdma (struct rt2x00_dev *rt2x00dev);
drivers/net/wireless/ti/wl18xx/event.c +28 -0
@@ -206,5 +206,33 @@ int wl18xx_process_mailbox_events(struct wl1271 *wl) mbox->sc_pwd_len, mbox->sc_pwd); +if (vector &RX_BA_WIN_SIZE_CHANGE_EVENT_ID ) { +struct wl12xx_vif *wlvif; +struct ieee80211_vif *vif; +struct ieee80211_sta *sta; +u8 link_id = mbox->rx_ba_link_id; +u8 win_size = mbox->rx_ba_win_size; +const u8 *addr; + + wlvif = wl->links[link_id].wlvif; + vif =wl12xx_wlvif_to_vif (wlvif); + +/* Update RX aggregation window size and call +* MAC routine to stop active RX aggregations for this link +*/ +if (wlvif->bss_type !=BSS_TYPE_AP_BSS ) + addr = vif->bss_conf.bssid; +else + addr = wl->links[link_id].addr; + + sta =ieee80211_find_sta (vif, addr); +if (sta) { + sta->max_rx_aggregation_subframes = win_size; +ieee80211_stop_rx_ba_session (vif, + wl->links[link_id].ba_bitmap, + addr); + } + } +return 0 ; }
drivers/net/wireless/ti/wl18xx/event.h +1 -0
@@ -38,6 +38,7 @@ enum {REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID =BIT (18 ),DFS_CHANNELS_CONFIG_COMPLETE_EVENT =BIT (19 ),PERIODIC_SCAN_REPORT_EVENT_ID =BIT (20 ), +RX_BA_WIN_SIZE_CHANGE_EVENT_ID =BIT (21 ),SMART_CONFIG_SYNC_EVENT_ID =BIT (22 ),SMART_CONFIG_DECODE_EVENT_ID =BIT (23 ), TIME_SYNC_EVENT_ID = BIT(24),
drivers/net/wireless/ti/wl18xx/main.c +2 -1
@@ -1029,7 +1029,8 @@ static int wl18xx_boot(struct wl1271 *wl)DFS_CHANNELS_CONFIG_COMPLETE_EVENT |SMART_CONFIG_SYNC_EVENT_ID |SMART_CONFIG_DECODE_EVENT_ID | -TIME_SYNC_EVENT_ID ; +TIME_SYNC_EVENT_ID | +RX_BA_WIN_SIZE_CHANGE_EVENT_ID ; wl->ap_event_mask =MAX_TX_FAILURE_EVENT_ID ;
drivers/net/wireless/ti/wlcore/acx.c +3 -2
@@ -1419,7 +1419,8 @@ out:/* setup BA session receiver setting in the FW. */ int wl12xx_acx_set_ba_receiver_session (struct wl1271 *wl,u8 tid_index, -u16 ssn,bool enable,u8 peer_hlid) +u16 ssn,bool enable,u8 peer_hlid, +u8 win_size) {struct wl1271_acx_ba_receiver_setup *acx;int ret;
@@ -1435,7 +1436,7 @@ int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, acx->hlid = peer_hlid; acx->tid = tid_index; acx->enable = enable; - acx->win_size = wl->conf.ht.rx_ba_win_size; + acx->win_size = win_size; acx->ssn = ssn; ret = wlcore_cmd_configure_failsafe(wl, ACX_BA_SESSION_RX_SETUP, acx,
drivers/net/wireless/ti/wlcore/acx.h +2 -1
@@ -1112,7 +1112,8 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl,int wl12xx_acx_set_ba_initiator_policy (struct wl1271 *wl,struct wl12xx_vif *wlvif);int wl12xx_acx_set_ba_receiver_session (struct wl1271 *wl,u8 tid_index, -u16 ssn,bool enable,u8 peer_hlid); +u16 ssn,bool enable,u8 peer_hlid, +u8 win_size);int wl12xx_acx_tsf_info (struct wl1271 *wl,struct wl12xx_vif *wlvif,u64 *mactime); int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
drivers/net/wireless/ti/wlcore/main.c +9 -5
@@ -5261,14 +5261,16 @@ out:static int wl1271_op_ampdu_action (struct ieee80211_hw *hw,struct ieee80211_vif *vif, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid,u16 *ssn, -u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {struct wl1271 *wl = hw->priv;struct wl12xx_vif *wlvif =wl12xx_vif_to_data (vif);int ret;u8 hlid, *ba_bitmap; +struct ieee80211_sta *sta = params->sta; +enum ieee80211_ampdu_mlme_action action = params->action; +u16 tid = params->tid; +u16 *ssn = ¶ms->ssn;wl1271_debug (DEBUG_MAC80211 ,"mac80211 ampdu action %d tid %d" , action, tid);
@@ -5326,7 +5328,9 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, } ret =wl12xx_acx_set_ba_receiver_session (wl, tid, *ssn, true, - hlid); + hlid, + params->buf_size); +if (!ret) { *ba_bitmap |=BIT (tid); wl->ba_rx_session_count++;
@@ -5347,7 +5351,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, } ret =wl12xx_acx_set_ba_receiver_session (wl, tid,0 , false, - hlid); + hlid,0 );if (!ret) { *ba_bitmap &= ~BIT (tid); wl->ba_rx_session_count--;
drivers/staging/comedi/drivers/jr3_pci.c +7 -6
@@ -610,7 +610,7 @@ static void jr3_pci_poll_dev(unsigned long data) s = &dev->subdevices[i]; spriv = s->private; -if (now > spriv->next_time_min) { +if (time_after_eq (now, spriv->next_time_min)) {struct jr3_pci_poll_delay sub_delay; sub_delay =jr3_pci_poll_subdevice (s);
@@ -726,11 +726,12 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, s->insn_read = jr3_pci_ai_insn_read; spriv =jr3_pci_alloc_spriv (dev, s); -if (spriv) { -/* Channel specific range and maxdata */ - s->range_table_list = spriv->range_table_list; - s->maxdata_list = spriv->maxdata_list; - } +if (!spriv) +return -ENOMEM ; + +/* Channel specific range and maxdata */ + s->range_table_list = spriv->range_table_list; + s->maxdata_list = spriv->maxdata_list; }/* Reset DSP card */
drivers/staging/gdm724x/gdm_mux.c +2 -2
@@ -670,14 +670,14 @@ static int __init gdm_usb_mux_init(void) static void __exit gdm_usb_mux_exit(void) { -unregister_lte_tty_driver (); -if (mux_rx_wq) {flush_workqueue (mux_rx_wq);destroy_workqueue (mux_rx_wq); }usb_deregister (&gdm_mux_driver); +unregister_lte_tty_driver (); + }module_init (gdm_usb_mux_init);
drivers/staging/vt6656/usbpipe.c +27 -4
@@ -50,15 +50,25 @@ int vnt_control_out(struct vnt_private *priv, u8 request, u16 value, u16 index, u16 length, u8 *buffer) { int status = 0; +u8 *usb_buffer;if (test_bit (DEVICE_FLAGS_DISCONNECTED , &priv->flags))return STATUS_FAILURE ;mutex_lock (&priv->usb_lock); + usb_buffer =kmemdup (buffer, length,GFP_KERNEL ); +if (!usb_buffer) { +mutex_unlock (&priv->usb_lock); +return -ENOMEM ; + } + status =usb_control_msg (priv->usb, -usb_sndctrlpipe (priv->usb,0 ), request,0x40 , value, - index, buffer, length,USB_CTL_WAIT ); +usb_sndctrlpipe (priv->usb,0 ), + request,0x40 , value, + index, usb_buffer, length,USB_CTL_WAIT ); + +kfree (usb_buffer);mutex_unlock (&priv->usb_lock);
@@ -78,15 +88,28 @@ int vnt_control_in(struct vnt_private *priv, u8 request, u16 value, u16 index, u16 length, u8 *buffer) { int status; +u8 *usb_buffer;if (test_bit (DEVICE_FLAGS_DISCONNECTED , &priv->flags))return STATUS_FAILURE ;mutex_lock (&priv->usb_lock); + usb_buffer =kmalloc (length,GFP_KERNEL ); +if (!usb_buffer) { +mutex_unlock (&priv->usb_lock); +return -ENOMEM ; + } + status =usb_control_msg (priv->usb, -usb_rcvctrlpipe (priv->usb,0 ), request,0xc0 , value, - index, buffer, length,USB_CTL_WAIT ); +usb_rcvctrlpipe (priv->usb,0 ), + request,0xc0 , value, + index, usb_buffer, length,USB_CTL_WAIT ); + +if (status == length) +memcpy (buffer, usb_buffer, length); + +kfree (usb_buffer);mutex_unlock (&priv->usb_lock);
drivers/target/iscsi/iscsi_target.c +1 -0
@@ -4821,6 +4821,7 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)continue ; }atomic_set (&sess->session_reinstatement,1 ); +atomic_set (&sess->session_fall_back_to_erl0,1 );spin_unlock (&sess->conn_lock);list_move_tail (&se_sess->sess_list, &free_list);
drivers/target/iscsi/iscsi_target_configfs.c +8 -22
@@ -725,11 +725,8 @@ static ssize_t lio_target_nacl_cmdsn_depth_store(struct config_item *item,if (iscsit_get_tpg (tpg) <0 )return -EINVAL ; -/* -* iscsit_tpg_set_initiator_node_queue_depth() assumes force=1 -*/ - ret =iscsit_tpg_set_initiator_node_queue_depth (tpg, -config_item_name (acl_ci), cmdsn_depth,1 ); + + ret =core_tpg_set_initiator_node_queue_depth (se_nacl, cmdsn_depth); pr_debug("LIO_Target_ConfigFS: %s/%s Set CmdSN Window: %u for" "InitiatorName: %s\n", config_item_name(wwn_ci),
@@ -1593,42 +1590,31 @@ static int lio_tpg_check_prot_fabric_only( }/* -* Called with spin_lock_irq(struct se_portal_group->session_lock) held -* or not held. -* -* Also, this function calls iscsit_inc_session_usage_count() on the +* This function calls iscsit_inc_session_usage_count() on the * struct iscsi_session in question. */ static int lio_tpg_shutdown_session (struct se_session *se_sess) {struct iscsi_session *sess = se_sess->fabric_sess_ptr; -struct se_portal_group *se_tpg = se_sess->se_tpg; -bool local_lock = false; - -if (!spin_is_locked (&se_tpg->session_lock)) { -spin_lock_irq (&se_tpg->session_lock); - local_lock = true; - } +struct se_portal_group *se_tpg = &sess->tpg->tpg_se_tpg; +spin_lock_bh (&se_tpg->session_lock);spin_lock (&sess->conn_lock);if (atomic_read (&sess->session_fall_back_to_erl0) ||atomic_read (&sess->session_logout) || (sess->time2retain_timer_flags &ISCSI_TF_EXPIRED )) {spin_unlock (&sess->conn_lock); -if (local_lock) -spin_unlock_irq (&sess->conn_lock); +spin_unlock_bh (&se_tpg->session_lock);return 0 ; }atomic_set (&sess->session_reinstatement,1 ); +atomic_set (&sess->session_fall_back_to_erl0,1 );spin_unlock (&sess->conn_lock);iscsit_stop_time2retain_timer (sess); -spin_unlock_irq (&se_tpg->session_lock); +spin_unlock_bh (&se_tpg->session_lock);iscsit_stop_session (sess,1 ,1 ); -if (!local_lock) -spin_lock_irq (&se_tpg->session_lock); -return 1 ; }
drivers/target/iscsi/iscsi_target_login.c +1 -0
@@ -195,6 +195,7 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn) initiatorname_param->value) && (sess_p->sess_ops->SessionType == sessiontype))) {atomic_set (&sess_p->session_reinstatement,1 ); +atomic_set (&sess_p->session_fall_back_to_erl0,1 );spin_unlock (&sess_p->conn_lock);iscsit_inc_session_usage_count (sess_p);iscsit_stop_time2retain_timer (sess_p);
drivers/target/iscsi/iscsi_target_tpg.c +0 -10
@@ -589,16 +589,6 @@ int iscsit_tpg_del_network_portal(return iscsit_tpg_release_np (tpg_np, tpg, np); } -int iscsit_tpg_set_initiator_node_queue_depth ( -struct iscsi_portal_group *tpg, -unsigned char *initiatorname, -u32 queue_depth, -int force) -{ -return core_tpg_set_initiator_node_queue_depth (&tpg->tpg_se_tpg, - initiatorname, queue_depth, force); -} -int iscsit_ta_authentication (struct iscsi_portal_group *tpg,u32 authentication) {unsigned char buf1[256 ], buf2[256 ], *none =NULL ;
drivers/target/iscsi/iscsi_target_tpg.h +0 -2
@@ -26,8 +26,6 @@ extern struct iscsi_tpg_np *iscsit_tpg_add_network_portal(struct iscsi_portal_gr int);extern int iscsit_tpg_del_network_portal (struct iscsi_portal_group *,struct iscsi_tpg_np *); -extern int iscsit_tpg_set_initiator_node_queue_depth (struct iscsi_portal_group *, -unsigned char *,u32 ,int );extern int iscsit_ta_authentication (struct iscsi_portal_group *,u32 );extern int iscsit_ta_login_timeout (struct iscsi_portal_group *,u32 );extern int iscsit_ta_netif_timeout (struct iscsi_portal_group *,u32 );
drivers/target/target_core_file.c +1 -2
@@ -594,8 +594,7 @@ fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,if (ret <0 )return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; -if (ret) -target_complete_cmd (cmd,SAM_STAT_GOOD ); +target_complete_cmd (cmd,SAM_STAT_GOOD );return 0 ; }
drivers/target/target_core_sbc.c +4 -1
@@ -498,8 +498,11 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes* been failed with a non-zero SCSI status. */ if (cmd->scsi_status) { -pr_err ("compare_and_write_callback: non zero scsi_status:" +pr_debug ("compare_and_write_callback: non zero scsi_status:" " 0x%02x\n" , cmd->scsi_status); + *post_ret =1 ; +if (cmd->scsi_status ==SAM_STAT_CHECK_CONDITION ) + ret =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; goto out; }
drivers/target/target_core_tpg.c +45 -107
212 lines not on this page · raw message
drivers/target/target_core_transport.c +2 -2
@@ -383,9 +383,9 @@ static void target_release_session(struct kref *kref) se_tpg->se_tpg_tfo->close_session (se_sess); } -void target_get_session (struct se_session *se_sess) +int target_get_session (struct se_session *se_sess) { -kref_get (&se_sess->sess_kref); +return kref_get_unless_zero (&se_sess->sess_kref); }EXPORT_SYMBOL (target_get_session);
drivers/tty/pty.c +1 -6
@@ -216,16 +216,11 @@ static int pty_signal(struct tty_struct *tty, int sig)static void pty_flush_buffer (struct tty_struct *tty) {struct tty_struct *to = tty->link; -struct tty_ldisc *ld;if (!to)return ; - ld =tty_ldisc_ref (to); -tty_buffer_flush (to, ld); -if (ld) -tty_ldisc_deref (ld); - +tty_buffer_flush (to,NULL );if (to->packet) {spin_lock_irq (&tty->ctrl_lock); tty->ctrl_status |=TIOCPKT_FLUSHWRITE ;
drivers/tty/serial/omap-serial.c +7 -2
@@ -1712,7 +1712,8 @@ static int serial_omap_probe(struct platform_device *pdev)return 0 ; err_add_port: -pm_runtime_put (&pdev->dev); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);pm_qos_remove_request (&up->pm_qos_request);device_init_wakeup (up->dev, false);
@@ -1725,9 +1726,13 @@ static int serial_omap_remove(struct platform_device *dev) {struct uart_omap_port *up =platform_get_drvdata (dev); +pm_runtime_get_sync (up->dev); + +uart_remove_one_port (&serial_omap_reg, &up->port); + +pm_runtime_dont_use_autosuspend (up->dev);pm_runtime_put_sync (up->dev);pm_runtime_disable (up->dev); -uart_remove_one_port (&serial_omap_reg, &up->port);pm_qos_remove_request (&up->pm_qos_request);device_init_wakeup (&dev->dev, false);
drivers/tty/serial/samsung.c +4 -5
@@ -900,14 +900,13 @@ static int s3c24xx_serial_request_dma(struct s3c24xx_uart_port *p)return -ENOMEM ; } - dma->rx_addr =dma_map_single (dma->rx_chan->device->dev, dma->rx_buf, + dma->rx_addr =dma_map_single (p->port.dev, dma->rx_buf, dma->rx_size,DMA_FROM_DEVICE );spin_lock_irqsave (&p->port.lock, flags);/* TX buffer */ - dma->tx_addr =dma_map_single (dma->tx_chan->device->dev, - p->port.state->xmit.buf, + dma->tx_addr =dma_map_single (p->port.dev, p->port.state->xmit.buf,UART_XMIT_SIZE ,DMA_TO_DEVICE );spin_unlock_irqrestore (&p->port.lock, flags);
@@ -921,7 +920,7 @@ static void s3c24xx_serial_release_dma(struct s3c24xx_uart_port *p)if (dma->rx_chan) {dmaengine_terminate_all (dma->rx_chan); -dma_unmap_single (dma->rx_chan->device->dev, dma->rx_addr, +dma_unmap_single (p->port.dev, dma->rx_addr, dma->rx_size,DMA_FROM_DEVICE );kfree (dma->rx_buf);dma_release_channel (dma->rx_chan);
@@ -930,7 +929,7 @@ static void s3c24xx_serial_release_dma(struct s3c24xx_uart_port *p)if (dma->tx_chan) {dmaengine_terminate_all (dma->tx_chan); -dma_unmap_single (dma->tx_chan->device->dev, dma->tx_addr, +dma_unmap_single (p->port.dev, dma->tx_addr,UART_XMIT_SIZE ,DMA_TO_DEVICE );dma_release_channel (dma->tx_chan); dma->tx_chan =NULL ;
drivers/usb/core/driver.c +21 -0
@@ -1328,6 +1328,24 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)*/ if (udev->parent && !PMSG_IS_AUTO (msg)) status =0 ; + +/* +* If the device is inaccessible, don't try to resume +* suspended interfaces and just return the error. +*/ +if (status && status != -EBUSY ) { +int err; +u16 devstat; + + err =usb_get_status (udev,USB_RECIP_DEVICE ,0 , + &devstat); +if (err) { +dev_err (&udev->dev, +"Failed to suspend device, error %d\n" , + status); + goto done; + } + } }/* If the suspend failed, resume interfaces that did get suspended */
@@ -1760,6 +1778,9 @@ static int autosuspend_check(struct usb_device *udev)int w, i;struct usb_interface *intf; +if (udev->state ==USB_STATE_NOTATTACHED ) +return -ENODEV ; +/* Fail if autosuspend is disabled, or any interfaces are in use, or * any interface drivers require remote wakeup but it isn't available. */
drivers/usb/core/file.c +7 -2
@@ -26,6 +26,7 @@#define MAX_USB_MINORS 256static const struct file_operations *usb_minors[MAX_USB_MINORS ];static DECLARE_RWSEM (minor_rwsem); +static DEFINE_MUTEX (init_usb_class_mutex);static int usb_open (struct inode *inode,struct file *file) {
@@ -108,8 +109,9 @@ static void release_usb_class(struct kref *kref)static void destroy_usb_class (void ) { -if (usb_class) -kref_put (&usb_class->kref, release_usb_class); +mutex_lock (&init_usb_class_mutex); +kref_put (&usb_class->kref, release_usb_class); +mutex_unlock (&init_usb_class_mutex); }int usb_major_init (void )
@@ -171,7 +173,10 @@ int usb_register_dev(struct usb_interface *intf,if (intf->minor >=0 )return -EADDRINUSE ; +mutex_lock (&init_usb_class_mutex); retval =init_usb_class (); +mutex_unlock (&init_usb_class_mutex); +if (retval)return retval;
drivers/usb/core/hub.c +10 -1
@@ -1048,6 +1048,9 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) portstatus = portchange =0 ; status =hub_port_status (hub, port1, &portstatus, &portchange); +if (status) + goto abort; +if (udev || (portstatus &USB_PORT_STAT_CONNECTION ))dev_dbg (&port_dev->dev,"status %04x change %04x\n" , portstatus, portchange);
@@ -1180,7 +1183,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)/* Scan all ports that need attention */ kick_hub_wq (hub); - + abort:if (type ==HUB_INIT2 || type ==HUB_INIT3 ) {/* Allow autosuspend if it was suppressed */ disconnected:
@@ -2068,6 +2071,12 @@ void usb_disconnect(struct usb_device **pdev)dev_info (&udev->dev,"USB disconnect, device number %d\n" , udev->devnum); +/* +* Ensure that the pm runtime code knows that the USB device +* is in the process of being disconnected. +*/ +pm_runtime_barrier (&udev->dev); +usb_lock_device (udev);hub_disconnect_children (udev);
drivers/usb/host/xhci-mem.c +1 -1
@@ -2493,7 +2493,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) (xhci->cmd_ring->first_seg->dma & (u64 ) ~CMD_RING_RSVD_BITS ) | xhci->cmd_ring->cycle_state;xhci_dbg_trace (xhci, trace_xhci_dbg_init, -"// Setting command ring address to 0x%x" , val); +"// Setting command ring address to 0x%016llx" , val_64);xhci_write_64 (xhci, val_64, &xhci->op_regs->cmd_ring);xhci_dbg_cmd_ptrs (xhci);
drivers/usb/misc/usbtest.c +1 -0
@@ -135,6 +135,7 @@ get_endpoints(struct usbtest_dev *dev, struct usb_interface *intf)case USB_ENDPOINT_XFER_INT :if (dev->info->intr) goto try_intr; +continue ;case USB_ENDPOINT_XFER_ISOC :if (dev->info->iso) goto try_iso;
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -873,6 +873,7 @@ static const struct usb_device_id id_table_combined[] = { {USB_DEVICE_AND_INTERFACE_INFO (MICROCHIP_VID ,MICROCHIP_USB_BOARD_PID ,USB_CLASS_VENDOR_SPEC , USB_SUBCLASS_VENDOR_SPEC, 0x00) }, + { USB_DEVICE_INTERFACE_NUMBER(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID, 2) }, { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -873,6 +873,12 @@#define FIC_VID 0x1457#define FIC_NEO1973_DEBUG_PID 0x5118 +/* +* Actel / Microsemi +*/ +#define ACTEL_VID 0x1514 +#define MICROSEMI_ARROW_SF2PLUS_BOARD_PID 0x2008 +/* Olimex */ #define OLIMEX_VID 0x15BA#define OLIMEX_ARM_USB_OCD_PID 0x0003
drivers/vfio/vfio_iommu_type1.c +43 -59
151 lines not on this page · raw message
fs/block_dev.c +5 -6
@@ -88,12 +88,11 @@ void invalidate_bdev(struct block_device *bdev) {struct address_space *mapping = bdev->bd_inode->i_mapping; -if (mapping->nrpages ==0 ) -return ; - -invalidate_bh_lrus (); -lru_add_drain_all ();/* make sure all lru add caches are flushed */ -invalidate_mapping_pages (mapping,0 ,-1 ); +if (mapping->nrpages) { +invalidate_bh_lrus (); +lru_add_drain_all ();/* make sure all lru add caches are flushed */ +invalidate_mapping_pages (mapping,0 ,-1 ); + }/* 99% of the time, we don't need to flush the cleancache on the bdev. * But, for the strange corners, lets be cautious */
fs/ceph/xattr.c +3 -0
@@ -369,6 +369,7 @@ static int __set_xattr(struct ceph_inode_info *ci,if (update_xattr) {int err =0 ; +if (xattr && (flags &XATTR_CREATE )) err = -EEXIST ;else if (!xattr && (flags &XATTR_REPLACE ))
@@ -376,12 +377,14 @@ static int __set_xattr(struct ceph_inode_info *ci,if (err) {kfree (name);kfree (val); +kfree (*newxattr);return err; }if (update_xattr <0 ) {if (xattr)__remove_xattr (ci, xattr);kfree (name); +kfree (*newxattr);return 0 ; } }
fs/cifs/cifs_unicode.c +6 -0
@@ -83,6 +83,9 @@ convert_sfm_char(const __u16 src_char, char *target)case SFM_COLON : *target =':' ;break ; +case SFM_DOUBLEQUOTE : + *target ='"' ; +break ;case SFM_ASTERISK : *target ='*' ;break ;
@@ -418,6 +421,9 @@ static __le16 convert_to_sfm_char(char src_char, bool end_of_string)case ':' : dest_char =cpu_to_le16 (SFM_COLON );break ; +case '"' : + dest_char =cpu_to_le16 (SFM_DOUBLEQUOTE ); +break ;case '*' : dest_char =cpu_to_le16 (SFM_ASTERISK );break ;
fs/cifs/cifs_unicode.h +3 -2
@@ -57,6 +57,7 @@* not conflict (although almost does) with the mapping above. */ +#define SFM_DOUBLEQUOTE ((__u16) 0xF020)#define SFM_ASTERISK ((__u16) 0xF021)#define SFM_QUESTION ((__u16) 0xF025)#define SFM_COLON ((__u16) 0xF022)
@@ -64,8 +65,8 @@#define SFM_LESSTHAN ((__u16) 0xF023)#define SFM_PIPE ((__u16) 0xF027)#define SFM_SLASH ((__u16) 0xF026) -#define SFM_PERIOD ((__u16) 0xF028) -#define SFM_SPACE ((__u16) 0xF029) +#define SFM_SPACE ((__u16) 0xF028) +#define SFM_PERIOD ((__u16) 0xF029)/* * Mapping mechanism to use when one of the seven reserved characters is
fs/cifs/cifssmb.c +3 -0
@@ -717,6 +717,9 @@ CIFSSMBEcho(struct TCP_Server_Info *server)if (rc)return rc; +if (server->capabilities &CAP_UNICODE ) + smb->hdr.Flags2 |=SMBFLG2_UNICODE ; +/* set up echo request */ smb->hdr.Tid =0xffff ; smb->hdr.WordCount =1 ;
fs/cifs/ioctl.c +2 -0
@@ -272,6 +272,8 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) rc = -EOPNOTSUPP ;break ;case CIFS_IOC_GET_MNT_INFO : +if (pSMBFile ==NULL ) +break ; tcon =tlink_tcon (pSMBFile->tlink); rc =smb_mnt_get_fsinfo (xid, tcon, (void __user *)arg);break ;
fs/cifs/smb2pdu.c +11 -3
@@ -564,8 +564,12 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon) }if (rsplen !=sizeof (struct validate_negotiate_info_rsp )) { -cifs_dbg (VFS ,"invalid size of protocol negotiate response\n" ); -return -EIO ; +cifs_dbg (VFS ,"invalid protocol negotiate response size: %d\n" , + rsplen); + +/* relax check since Mac returns max bufsize allowed on ioctl */ +if (rsplen > CIFSMaxBufSize) +return -EIO ; }/* check validate negotiate info response matches what we got earlier */
@@ -1518,8 +1522,12 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,* than one credit. Windows typically sets this smaller, but for some * ioctls it may be useful to allow server to send more. No point * limiting what the server can send as long as fits in one credit +* Unfortunately - we can not handle more than CIFS_MAX_MSG_SIZE +* (by default, note that it can be overridden to make max larger) +* in responses (except for read responses which can be bigger. +* We may want to bump this limit up */ - req->MaxOutputResponse =cpu_to_le32 (0xFF00 );/* < 64K uses 1 credit */ + req->MaxOutputResponse =cpu_to_le32 (CIFSMaxBufSize);if (is_fsctl) req->Flags =cpu_to_le32 (SMB2_0_IOCTL_IS_FSCTL );
fs/ext4/inode.c +5 -0
@@ -5393,6 +5393,11 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)file_update_time (vma->vm_file);down_read (&EXT4_I (inode)->i_mmap_sem); + + ret =ext4_convert_inline_data (inode); +if (ret) + goto out_ret; +/* Delalloc case is easy... */ if (test_opt(inode->i_sb, DELALLOC) && !ext4_should_journal_data(inode) &&
fs/xattr.c +1 -1
@@ -442,7 +442,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value, size =XATTR_SIZE_MAX ; kvalue =kzalloc (size,GFP_KERNEL | __GFP_NOWARN);if (!kvalue) { - vvalue =vmalloc (size); + vvalue =vzalloc (size);if (!vvalue)return -ENOMEM ; kvalue = vvalue;
include/net/mac80211.h +35 -13
84 lines not on this page · raw message
include/target/target_core_fabric.h +2 -3
@@ -117,7 +117,7 @@ void __transport_register_session(struct se_portal_group *, struct se_node_acl *, struct se_session *, void *);void transport_register_session (struct se_portal_group *,struct se_node_acl *,struct se_session *,void *); -void target_get_session (struct se_session *); +int target_get_session (struct se_session *);void target_put_session (struct se_session *);ssize_t target_show_dynamic_sessions (struct se_portal_group *,char *);void transport_free_session (struct se_session *);
@@ -172,8 +172,7 @@ bool target_tpg_has_node_acl(struct se_portal_group *tpg, const char *);struct se_node_acl *core_tpg_check_initiator_node_acl (struct se_portal_group *,unsigned char *); -int core_tpg_set_initiator_node_queue_depth (struct se_portal_group *, -unsigned char *,u32 ,int ); +int core_tpg_set_initiator_node_queue_depth (struct se_node_acl *,u32 );int core_tpg_set_initiator_node_tag (struct se_portal_group *,struct se_node_acl *,const char *);int core_tpg_register (struct se_wwn *,struct se_portal_group *,int );
kernel/padata.c +1 -1
@@ -357,7 +357,7 @@ static int padata_setup_cpumasks(struct parallel_data *pd,cpumask_and (pd->cpumask.pcpu, pcpumask, cpu_online_mask);if (!alloc_cpumask_var (&pd->cpumask.cbcpu,GFP_KERNEL )) { -free_cpumask_var (pd->cpumask.cbcpu); +free_cpumask_var (pd->cpumask.pcpu);return -ENOMEM ; }
net/bluetooth/hci_sock.c +2 -1
@@ -1164,7 +1164,8 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg,if (msg->msg_flags &MSG_OOB )return -EOPNOTSUPP ; -if (msg->msg_flags & ~(MSG_DONTWAIT |MSG_NOSIGNAL |MSG_ERRQUEUE )) +if (msg->msg_flags & ~(MSG_DONTWAIT |MSG_NOSIGNAL |MSG_ERRQUEUE | +MSG_CMSG_COMPAT ))return -EINVAL ;if (len <4 || len >HCI_MAX_FRAME_SIZE )
net/mac80211/agg-rx.c +26 -6
@@ -7,6 +7,7 @@* Copyright 2006-2007 Jiri Benc <[email protected]> * Copyright 2007, Michael Wu <[email protected]> * Copyright 2007-2010, Intel Corporation +* Copyright(c) 2015 Intel Deutschland GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -61,6 +62,14 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, {struct ieee80211_local *local = sta->local;struct tid_ampdu_rx *tid_rx; +struct ieee80211_ampdu_params params = { + .sta = &sta->sta, + .action =IEEE80211_AMPDU_RX_STOP , + .tid = tid, + .amsdu = false, + .timeout =0 , + .ssn =0 , + };lockdep_assert_held (&sta->ampdu_mlme.mtx);
@@ -78,8 +87,7 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, initiator ==WLAN_BACK_RECIPIENT ?"recipient" :"inititator" , (int)reason); -if (drv_ampdu_action (local, sta->sdata,IEEE80211_AMPDU_RX_STOP , - &sta->sta, tid,NULL ,0 , false)) +if (drv_ampdu_action (local, sta->sdata, ¶ms))sdata_info (sta->sdata,"HW problem - can not stop rx aggregation for %pM tid %d\n" , sta->sta.addr, tid);
@@ -237,6 +245,15 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, {struct ieee80211_local *local = sta->sdata->local;struct tid_ampdu_rx *tid_agg_rx; +struct ieee80211_ampdu_params params = { + .sta = &sta->sta, + .action =IEEE80211_AMPDU_RX_START , + .tid = tid, + .amsdu = false, + .timeout = timeout, + .ssn = start_seq_num, + }; +int i, ret = -EOPNOTSUPP ;u16 status =WLAN_STATUS_REQUEST_DECLINED ;
@@ -273,8 +290,12 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, buf_size =IEEE80211_MAX_AMPDU_BUF ;/* make sure the size doesn't exceed the maximum supported by the hw */ -if (buf_size > local->hw.max_rx_aggregation_subframes) - buf_size = local->hw.max_rx_aggregation_subframes; +if (buf_size > sta->sta.max_rx_aggregation_subframes) + buf_size = sta->sta.max_rx_aggregation_subframes; + params.buf_size = buf_size; + +ht_dbg (sta->sdata,"AddBA Req buf_size=%d for %pM\n" , + buf_size, sta->sta.addr);/* examine state machine */ mutex_lock (&sta->ampdu_mlme.mtx);
@@ -322,8 +343,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta,for (i =0 ; i < buf_size; i++)__skb_queue_head_init (&tid_agg_rx->reorder_buf[i]); - ret =drv_ampdu_action (local, sta->sdata,IEEE80211_AMPDU_RX_START , - &sta->sta, tid, &start_seq_num,0 , false); + ret =drv_ampdu_action (local, sta->sdata, ¶ms);ht_dbg (sta->sdata,"Rx A-MPDU request on %pM tid %d result %d\n" , sta->sta.addr, tid, ret);if (ret) {
net/mac80211/agg-tx.c +35 -18
117 lines not on this page · raw message
net/mac80211/driver-ops.c +3 -7
@@ -284,9 +284,7 @@ int drv_switch_vif_chanctx(struct ieee80211_local *local,int drv_ampdu_action (struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid, -u16 *ssn,u8 buf_size,bool amsdu) +struct ieee80211_ampdu_params *params) {int ret = -EOPNOTSUPP ;
@@ -296,12 +294,10 @@ int drv_ampdu_action(struct ieee80211_local *local,if (!check_sdata_in_driver (sdata))return -EIO ; -trace_drv_ampdu_action (local, sdata, action, sta, tid, - ssn, buf_size, amsdu); +trace_drv_ampdu_action (local, sdata, params);if (local->ops->ampdu_action) - ret = local->ops->ampdu_action (&local->hw, &sdata->vif, action, - sta, tid, ssn, buf_size, amsdu); + ret = local->ops->ampdu_action (&local->hw, &sdata->vif, params);trace_drv_return_int (local, ret);
net/mac80211/driver-ops.h +1 -3
@@ -585,9 +585,7 @@ static inline int drv_tx_last_beacon(struct ieee80211_local *local)int drv_ampdu_action (struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata, -enum ieee80211_ampdu_mlme_action action, -struct ieee80211_sta *sta,u16 tid, -u16 *ssn,u8 buf_size,bool amsdu); +struct ieee80211_ampdu_params *params);static inline int drv_get_survey (struct ieee80211_local *local,int idx,struct survey_info *survey)
net/mac80211/sta_info.c +3 -0
@@ -329,6 +329,9 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,memcpy (sta->addr, addr,ETH_ALEN );memcpy (sta->sta.addr, addr,ETH_ALEN ); + sta->sta.max_rx_aggregation_subframes = + local->hw.max_rx_aggregation_subframes; + sta->local = local; sta->sdata = sdata; sta->rx_stats.last_rx = jiffies;
net/mac80211/trace.h +23 -20
68 lines not on this page · raw message
tools/testing/selftests/x86/ldt_gdt.c +46 -0
58 lines not on this page · raw message