1. 12 1月, 2018 6 次提交
    • D
      Merge branch 'for-upstream' of... · 3d93e337
      David S. Miller 提交于
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2018-01-11
      
      Here's likely the last bluetooth-next pull request for the 4.16 kernel.
      
       - Added support for Bluetooth on 2015+ MacBook (Pro)
       - Fix to QCA Rome suspend/resume handling
       - Two new QCA_ROME USB IDs in btusb
       - A few other minor fixes
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3d93e337
    • W
      net: phy: mdio-bcm-unimac: fix potential NULL dereference in unimac_mdio_probe() · 297a6961
      Wei Yongjun 提交于
      platform_get_resource() may fail and return NULL, so we should
      better check it's return value to avoid a NULL pointer dereference
      a bit later in the code.
      
      This is detected by Coccinelle semantic patch.
      
      @@
      expression pdev, res, n, t, e, e1, e2;
      @@
      
      res = platform_get_resource(pdev, t, n);
      + if (!res)
      +   return -EINVAL;
      ... when != res == NULL
      e = devm_ioremap(e1, res->start, e2);
      Signed-off-by: NWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      297a6961
    • W
      net: socionext: Fix error return code in netsec_netdev_open() · ecb10288
      Wei Yongjun 提交于
      Fix to return error code -ENODEV from the of_phy_connect() error
      handling case instead of 0, as done elsewhere in this function.
      
      Fixes: 533dd11a ("net: socionext: Add Synquacer NetSec driver")
      Signed-off-by: NWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ecb10288
    • A
      net: socionext: include linux/io.h to fix build · d9f52372
      Arnd Bergmann 提交于
      I ran into a randconfig build failure:
      
      drivers/net/ethernet/socionext/netsec.c: In function 'netsec_probe':
      drivers/net/ethernet/socionext/netsec.c:1583:17: error: implicit declaration of function 'devm_ioremap'; did you mean 'ioremap'? [-Werror=implicit-function-declaration]
      
      Including linux/io.h directly fixes this.
      
      Fixes: 533dd11a ("net: socionext: Add Synquacer NetSec driver")
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Acked-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d9f52372
    • D
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 532b5aa0
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2018-01-10
      
      This series contains updates to i40e and i40evf only.
      
      Alice adds the displaying of priority xon/xoff packet stats, since we
      were already keeping track of them.  Based on the recent changes, bump
      the driver versions.
      
      Jake changes how the driver determines whether or not the device is
      currently up to resolve the possible issue of freeing data structures
      and other memory before they have been fully allocated.  Refactored
      the driver to simplify the locking behavior and to consistently use
      spinlocks instead of an overloaded bit lock to protect MAC and filter
      lists.  Created a helper function which can convert the AdminQ link
      speed definition into a virtchnl definition.
      
      Colin Ian King cleans up a redundant variable initialization.
      
      Alex cleans up the driver to stop clearing the pending bit array for
      each vector manually, since it is prone to dropping an interrupt and
      based on the hardware specs, the pending bit array will be cleared
      automatically in MSI-X mode.  Cleaned up flags for promiscuous mode to
      resolve an issue where enabling & disabling promiscuous mode on a VF
      would leave us in a high polling rate for the adminq task.  Cleaned up
      code that was prone to race issues.
      
      Jingjing renames pipeline personalization profile (ppp) to dynamic
      device personalization (ddp) because it was being confused with the
      well known point to point protocol.  Also removed checks for "track_id"
      being zero, since it is valid for it to be zero for profiles that do
      not have any 'write' commands.
      
      v2: cleaned up commit message for patch 12 based on feedback from Sergei
          Shtylyov and Alex Duyck
      v3: dropped patch 15 from the original series while Mariusz Stachura
          works on the changes that Jakub Kicinski has suggested
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      532b5aa0
    • N
      ibmvnic: Don't handle RX interrupts when not up. · 09fb35ea
      Nathan Fontenot 提交于
      Initiating a kdump via the command line can cause a pending interrupt
      to be handled by the ibmvnic driver when initializing the sub-CRQ
      irqs during driver initialization.
      
      NIP [d000000000ca34f0] ibmvnic_interrupt_rx+0x40/0xd0 [ibmvnic]
      LR [c000000008132ef0] __handle_irq_event_percpu+0xa0/0x2f0
      Call Trace:
      [c000000047fcfde0] [c000000008132ef0] __handle_irq_event_percpu+0xa0/0x2f0
      [c000000047fcfea0] [c00000000813317c] handle_irq_event_percpu+0x3c/0x90
      [c000000047fcfee0] [c00000000813323c] handle_irq_event+0x6c/0xd0
      [c000000047fcff10] [c0000000081385e0] handle_fasteoi_irq+0xf0/0x250
      [c000000047fcff40] [c0000000081320a0] generic_handle_irq+0x50/0x80
      [c000000047fcff60] [c000000008014984] __do_irq+0x84/0x1d0
      [c000000047fcff90] [c000000008027564] call_do_irq+0x14/0x24
      [c00000003c92af00] [c000000008014b70] do_IRQ+0xa0/0x120
      [c00000003c92af50] [c000000008002594] hardware_interrupt_common+0x114/0x180
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      09fb35ea
  2. 11 1月, 2018 34 次提交