1. 13 Jul, 2016 4 commits
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 0ba3deb3
      David S. Miller authored
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2016-07-13
      
      Here's our main bluetooth-next pull request for the 4.8 kernel:
      
       - Fixes and cleanups in 802.15.4 and 6LoWPAN code
       - Fix out of bounds issue in btmrvl driver
       - Fixes to Bluetooth socket recvmsg return values
       - Use crypto_cipher_encrypt_one() instead of crypto_skcipher
       - Cleanup of Bluetooth connection sysfs interface
       - New Authentication failure reson code for Disconnected mgmt event
       - New USB IDs for Atheros, Qualcomm and Intel Bluetooth controllers
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0ba3deb3
    • David Ahern's avatar
      net: vrf: Documentation update · 6e076537
      David Ahern authored
      Update vrf documentation for changes made to 4.4 - 4.8 kernels
      and iproute2 support for vrf keyword.
      Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e076537
    • Johan Hedberg's avatar
      Bluetooth: Increment management interface revision · 87510973
      Johan Hedberg authored
      Increment the mgmt revision due to the recently added new
      reason code for the Disconnected event.
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      87510973
    • Szymon Janc's avatar
      Bluetooth: Add Authentication Failed reason to Disconnected Mgmt event · 160b9251
      Szymon Janc authored
      If link is disconnected due to Authentication Failure (PIN or Key
      Missing status) userspace will be notified about this with proper error
      code. Many LE profiles define "PIN or Key Missing" status as indication
      of remote lost bond so this allows userspace to take action on this.
      
      @ Device Connected: 88:63:DF:88:0E:83 (1) flags 0x0000
              02 01 1a 05 03 0a 18 0d 18 0b 09 48 65 61 72 74  ...........Heart
              20 52 61 74 65                                    Rate
      > HCI Event: Command Status (0x0f) plen 4
            LE Read Remote Used Features (0x08|0x0016) ncmd 1
              Status: Success (0x00)
      > ACL Data RX: Handle 3585 flags 0x02 dlen 11
            ATT: Read By Group Type Request (0x10) len 6
              Handle range: 0x0001-0xffff
              Attribute group type: Primary Service (0x2800)
      > HCI Event: LE Meta Event (0x3e) plen 12
            LE Read Remote Used Features (0x04)
              Status: Success (0x00)
              Handle: 3585
              Features: 0x01 0x00 0x00 0x00 0x00 0x00 0x00 0x00
                LE Encryption
      < HCI Command: LE Start Encryption (0x08|0x0019) plen 28
              Handle: 3585
              Random number: 0x0000000000000000
              Encrypted diversifier: 0x0000
              Long term key: 26201cd479a0921b6f949f0b1fa8dc82
      > HCI Event: Command Status (0x0f) plen 4
            LE Start Encryption (0x08|0x0019) ncmd 1
              Status: Success (0x00)
      > HCI Event: Encryption Change (0x08) plen 4
              Status: PIN or Key Missing (0x06)
              Handle: 3585
              Encryption: Disabled (0x00)
      < HCI Command: Disconnect (0x01|0x0006) plen 3
              Handle: 3585
              Reason: Authentication Failure (0x05)
      > HCI Event: Command Status (0x0f) plen 4
            Disconnect (0x01|0x0006) ncmd 1
              Status: Success (0x00)
      > HCI Event: Disconnect Complete (0x05) plen 4
              Status: Success (0x00)
              Handle: 3585
              Reason: Connection Terminated By Local Host (0x16)
      @ Device Disconnected: 88:63:DF:88:0E:83 (1) reason 4
      
      @ Device Connected: C4:43:8F:A3:4D:83 (0) flags 0x0000
              08 09 4e 65 78 75 73 20 35                       ..Nexus 5
      > HCI Event: Command Status (0x0f) plen 4
            Authentication Requested (0x01|0x0011) ncmd 1
              Status: Success (0x00)
      > HCI Event: Link Key Request (0x17) plen 6
              Address: C4:43:8F:A3:4D:83 (LG Electronics)
      < HCI Command: Link Key Request Reply (0x01|0x000b) plen 22
              Address: C4:43:8F:A3:4D:83 (LG Electronics)
              Link key: 080812e4aa97a863d11826f71f65a933
      > HCI Event: Command Complete (0x0e) plen 10
            Link Key Request Reply (0x01|0x000b) ncmd 1
              Status: Success (0x00)
              Address: C4:43:8F:A3:4D:83 (LG Electronics)
      > HCI Event: Auth Complete (0x06) plen 3
              Status: PIN or Key Missing (0x06)
              Handle: 75
      @ Authentication Failed: C4:43:8F:A3:4D:83 (0) status 0x05
      < HCI Command: Disconnect (0x01|0x0006) plen 3
              Handle: 75
              Reason: Remote User Terminated Connection (0x13)
      > HCI Event: Command Status (0x0f) plen 4
            Disconnect (0x01|0x0006) ncmd 1
              Status: Success (0x00)
      > HCI Event: Disconnect Complete (0x05) plen 4
              Status: Success (0x00)
              Handle: 75
              Reason: Connection Terminated By Local Host (0x16)
      @ Device Disconnected: C4:43:8F:A3:4D:83 (0) reason 4
      Signed-off-by: default avatarSzymon Janc <szymon.janc@codecoup.pl>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      160b9251
  2. 12 Jul, 2016 11 commits
  3. 11 Jul, 2016 21 commits
  4. 09 Jul, 2016 4 commits
    • Eric Dumazet's avatar
      ipv6: do not abuse GFP_ATOMIC in inet6_netconf_notify_devconf() · 927265bc
      Eric Dumazet authored
      All inet6_netconf_notify_devconf() callers are in process context,
      so we can use GFP_KERNEL allocations if we take care of not holding
      a rwlock while not needed in ip6mr (we hold RTNL there)
      
      Fixes: d67b8c61 ("netconf: advertise mc_forwarding status")
      Fixes: f3a1bfb1 ("rtnl/ipv6: use netconf msg to advertise forwarding status")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
      Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      927265bc
    • Eric Dumazet's avatar
      ipv4: do not abuse GFP_ATOMIC in inet_netconf_notify_devconf() · fa17806c
      Eric Dumazet authored
      inet_forward_change() runs with RTNL held.
      We are allowed to sleep if required.
      
      If we use __in_dev_get_rtnl() instead of __in_dev_get_rcu(),
      we no longer have to use GFP_ATOMIC allocations in
      inet_netconf_notify_devconf(), meaning we are less likely to miss
      notifications under memory pressure, and wont touch precious memory
      reserves either and risk dropping incoming packets.
      
      inet_netconf_get_devconf() can also use GFP_KERNEL allocation.
      
      Fixes: edc9e748 ("rtnl/ipv4: use netconf msg to advertise forwarding status")
      Fixes: 9e551110 ("rtnl/ipv4: add support of RTM_GETNETCONF")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
      Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fa17806c
    • David S. Miller's avatar
      Merge branch 'bgmac-platform-device' · db9a1ba5
      David S. Miller authored
      Jon Mason says:
      
      ====================
      net: ethernet: bgmac: Add platform device support
      
      David Miller, Please consider including patches 1-5 in net-next
      
      Florian Fainelli, Please consider including patches 6 & 7 in
        devicetree/next
      
      Changes in v2:
      * Made device tree binding changes suggested by Sergei Shtylyov,
        Ray Jui, Rob Herring, Florian Fainelli, and Arnd Bergmann
      * Removed devm_* error paths in the bgmac_platform.c suggested by
        Florian Fainelli
      * Added Arnd Bergmann's Acked-by to the first 5 (there were changes
        outlined in the bullets above, but I believe them to be minor enough
        for him to not revoke his acks)
      
      This patch series adds support for other, non-bcma iProc SoC's to the
      bgmac driver.  This series only adds NSP support, but we are interested
      in adding support for the Cygnus and NS2 families (with more possible
      down the road).
      
      To support non-bcma enabled SoCs, we need to add the standard device
      tree "platform device" support.  Unfortunately, this driver is very
      tighly coupled with the bcma bus and much unwinding is needed.  I tried
      to break this up into a number of patches to make it more obvious what
      was being done to add platform device support.  I was able to verify
      that the bcma code still works using a 53012K board (NS SoC), and that
      the platform code works using a 58625K board (NSP SoC).
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      db9a1ba5
    • Jon Mason's avatar
      net: ethernet: bgmac: Add platform device support · f6a95a24
      Jon Mason authored
      The bcma portion of the driver has been split off into a bcma specific
      driver.  This has been mirrored for the platform driver.  The last
      references to the bcma core struct have been changed into a generic
      function call.  These function calls are wrappers to either the original
      bcma code or new platform functions that access the same areas via MMIO.
      This necessitated adding function pointers for both platform and bcma to
      hide which backend is being used from the generic bgmac code.
      Signed-off-by: default avatarJon Mason <jon.mason@broadcom.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f6a95a24