1. 14 8月, 2014 40 次提交
    • J
      Bluetooth: Always call smp_distribute_keys() from a workqueue · 86d1407c
      Johan Hedberg 提交于
      The smp_distribute_keys() function calls smp_notify_keys() which in turn
      calls l2cap_conn_update_id_addr(). The l2cap_conn_update_id_addr()
      function will iterate through all L2CAP channels for the respective
      connection: lock the channel, update the address information and unlock
      the channel.
      
      Since SMP is now using l2cap_chan callbacks each callback is called with
      the channel lock held. Therefore, calling l2cap_conn_update_id_addr()
      would cause a deadlock calling l2cap_chan_lock() on the SMP channel.
      This patch moves calling smp_distribute_keys() through a workqueue so
      that it is never called from an L2CAP channel callback.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      86d1407c
    • J
      Bluetooth: Move canceling security_timer into smp_chan_destroy() · 109ec230
      Johan Hedberg 提交于
      All places needing to cancel the security timer also call
      smp_chan_destroy() in the same go. To eliminate the need to do these two
      calls in multiple places simply move the timer cancellation into
      smp_chan_destroy().
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      109ec230
    • J
      Bluetooth: Remove unused l2cap_conn->security_timer · 276d8073
      Johan Hedberg 提交于
      Now that there are no-longer any users for l2cap_conn->security_timer we
      can go ahead and simply remove it. The patch makes initialization of the
      conn->info_timer unconditional since it's better not to leave any
      l2cap_conn data structures uninitialized no matter what the underlying
      transport.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      276d8073
    • J
      Bluetooth: Add SMP-internal timeout callback · b68fda68
      Johan Hedberg 提交于
      This patch adds an SMP-internal timeout callback to remove the depenency
      on (the soon to be removed) l2cap_conn->security_timer. The behavior is
      the same as with l2cap_conn->security_timer except that the new
      l2cap_conn_shutdown() public function is used instead of the L2CAP core
      internal l2cap_conn_del().
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      b68fda68
    • J
      Bluetooth: Fix double free of SMP data skb · 8ae9b984
      Johan Hedberg 提交于
      In the case that the SMP recv callback returns error the calling code in
      l2cap_core.c expects that it still owns the skb and will try to free it.
      The SMP code should therefore not try to free the skb if it return an
      error. This patch fixes such behavior in the SMP command handler
      function.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      8ae9b984
    • J
      Bluetooth: Call l2cap_conn_shutdown() when SMP recv callback fails · 4befb867
      Johan Hedberg 提交于
      To restore pre-l2cap_chan functionality we should be trying to
      disconnect the connection when receviving garbage SMP data (i.e. when
      the SMP command handler fails). This patch renames the command handler
      back to smp_sig_channel() and adds a smp_recv_cb() wrapper function for
      calling it. If smp_sig_channel() fails the code calls
      l2cap_conn_shutdown().
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      4befb867
    • J
      Bluetooth: Add public l2cap_conn_shutdown() API to request disconnection · dec5b492
      Johan Hedberg 提交于
      Since we no-longer do special handling of SMP within l2cap_core.c we
      don't have any code for calling l2cap_conn_del() when smp.c doesn't like
      the data it gets. At the same time we cannot simply export
      l2cap_conn_del() since it will try to lock the channels it calls into
      whereas we already hold the lock in the smp.c l2cap_chan callbacks (i.e.
      it'd lead to a deadlock).
      
      This patch adds a new l2cap_conn_shutdown() API which is very similar to
      l2cap_conn_del() except that it defers the call to l2cap_conn_del()
      through a workqueue, thereby making it safe to use it from an L2CAP
      channel callback.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      dec5b492
    • J
      Bluetooth: Use L2CAP resume callback to call smp_distribute_keys · 44f1a7ab
      Johan Hedberg 提交于
      There's no need to export the smp_distribute_keys() function since the
      resume callback is called in the same scenario. This patch makes the
      smp_notify_keys function private (at the same time moving it higher up
      in smp.c to avoid forward declarations) and adds a resume callback for
      SMP to call it from there instead.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      44f1a7ab
    • V
      Add a new PID/VID 0227/0930 for AR3012. · 89d2975f
      Vincent Zwanenburg 提交于
      usb devices info:
      
      T:  Bus=01 Lev=02 Prnt=05 Port=00 Cnt=01 Dev#= 20 Spd=12   MxCh= 0
      D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
      P:  Vendor=0930 ProdID=0227 Rev= 0.02
      C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
      A:  FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01
      I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
      E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
      E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
      I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
      E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
      I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
      E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
      I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
      I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
      I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
      I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
      Signed-off-by: NVincent Zwanenburg <vincentz@topmail.ie>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      89d2975f
    • V
      MAINTAINERS: update maintainers info · ebef9c12
      Varka Bhadram 提交于
      adds the mailing list address for bluetooth 6loWPAN and
      IEEE-802.15.4 subsystems. Also adds web page info.
      Signed-off-by: NVarka Bhadram <varkab@cdac.in>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      ebef9c12
    • L
      Bluetooth: Fix HCI H5 corrupted ack value · 4807b518
      Loic Poulain 提交于
      In this expression: seq = (seq - 1) % 8
      seq (u8) is implicitly converted to an int in the arithmetic operation.
      So if seq value is 0, operation is ((0 - 1) % 8) => (-1 % 8) => -1.
      The new seq value is 0xff which is an invalid ACK value, we expect 0x07.
      It leads to frequent dropped ACK and retransmission.
      Fix this by using '&' binary operator instead of '%'.
      Signed-off-by: NLoic Poulain <loic.poulain@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      Cc: stable@vger.kernel.org
      4807b518
    • J
      Bluetooth: Convert SMP to use l2cap_chan infrastructure · 5d88cc73
      Johan Hedberg 提交于
      Now that we have all the necessary pieces in place we can fully convert
      SMP to use the L2CAP channel infrastructure. This patch adds the
      necessary callbacks and removes the now unneeded conn->smp_chan pointer.
      
      One notable behavioral change in this patch comes from the following
      code snippet:
      
      -       case L2CAP_CID_SMP:
      -               if (smp_sig_channel(conn, skb))
      -                       l2cap_conn_del(conn->hcon, EACCES);
      
      This piece of code was essentially forcing a disconnection if garbage
      SMP data was received. The l2cap_conn_del() function is private to
      l2cap_conn.c so we don't have access to it anymore when using the L2CAP
      channel callbacks. Therefore, the behavior of the new code is simply to
      return errors in the recv() callback (which is simply the old
      smp_sig_channel()), but no disconnection will occur.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      5d88cc73
    • J
      Bluetooth: Make AES crypto context private to SMP · defce9e8
      Johan Hedberg 提交于
      Now that we have per-adapter SMP data thanks to the root SMP L2CAP
      channel we can take advantage of it and attach the AES crypto context
      (only used for SMP) to it. This means that the smp_irk_matches() and
      smp_generate_rpa() function can be converted to internally handle the
      AES context.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      defce9e8
    • J
      Bluetooth: Add SMP L2CAP channel skeleton · 70db83c4
      Johan Hedberg 提交于
      This patch creates the initial SMP L2CAP channels and a skeleton for
      their callbacks. There is one per-adapter channel created upon adapter
      registration, and then one channel per-connection created through the
      new_connection callback. The channels are registered with the reserved
      CID 0x1f for now in order to not conflict with existing SMP
      functionality. Once everything is in place the value can be changed to
      what it should be, i.e. L2CAP_CID_SMP.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      70db83c4
    • J
      Bluetooth: Add more L2CAP convenience callbacks · f193844c
      Johan Hedberg 提交于
      In preparation for converting SMP to use l2cap_chan it's useful to add a
      few more callback helpers so that smp.c won't need to define all of its
      own.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      f193844c
    • J
      Bluetooth: Move SMP (de)initialization to smp.c · 711eafe3
      Johan Hedberg 提交于
      As preparation for moving SMP to use l2cap_chan infrastructure we need
      to move the (de)initialization functions to smp.c (where they'll
      eventually need access to the local L2CAP channel callbacks).
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      711eafe3
    • J
      Bluetooth: Move SMP initialization after HCI init · 54506918
      Johan Hedberg 提交于
      First of all, it's wasteful to initialize SMP if it's never going to be
      used (e.g. on non-LE controllers). Second of all, when we move to use
      l2cap_chan we need to know the real local address, meaning we must have
      completed at least part of the HCI init. This patch moves the SMP
      initialization to after the HCI init procedure and makes it depend on
      whether the controller actually supports LE.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      54506918
    • J
      Bluetooth: Refactor SMP (de)initialization into separate functions · 222916e3
      Johan Hedberg 提交于
      As preparation for converting SMP to use the l2cap_chan infrastructure
      refactor the (de)initialization into separate functions.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      222916e3
    • J
      Bluetooth: Fix IRK lookup when tfm_aes is not available · 893edede
      Johan Hedberg 提交于
      If the AES crypto has not been initialized properly we should cleanly
      return from the hci_find_irk_by_rpa() function. Right now this will not
      happen in practice, but once (in subsequent patches) SMP init is moved
      to after the HCI init procedure it is possible that the pointer is NULL.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      893edede
    • J
      Bluetooth: Fix hci_update_random_address() error return for no crypto · fabed38f
      Johan Hedberg 提交于
      If the AES crypto context is not available we cannot generate new RPAs.
      We should therefore cleanly return an error from the function
      responsible for updating the random address.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      fabed38f
    • J
      Bluetooth: Fix using HCI_CONN_LE_SMP_PEND to check for SMP context · d3368605
      Johan Hedberg 提交于
      The code is consistently using the HCI_CONN_LE_SMP_PEND flag check for
      the existence of the SMP context, with the exception of this one place
      in smp_sig_channel(). This patch converts the place to use the flag just
      like all other instances.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      d3368605
    • J
      Bluetooth: Call l2cap_le_conn_ready after notifying channels · 79a05727
      Johan Hedberg 提交于
      For most cases it makes no difference whether l2cap_le_conn_ready() is
      called before or after calling the channel ready() callbacks, however
      for upcoming SMP code we need this as the ready() callback initializes
      certain structures that a call to smp_conn_security() from
      l2cap_le_conn_ready() depends on. Therefore, move the call to
      l2cap_le_conn_ready() after iterating through and notifying channels.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      79a05727
    • J
      Bluetooth: Call L2CAP teardown callback before clearing chan->conn · 72847ce0
      Johan Hedberg 提交于
      L2CAP channel implementations may want to still access the chan->conn
      pointer. This will particularly be the case for SMP that will want to
      clear a reference to the SMP channel in the l2cap_conn structure. The
      only user of the teardown callback so far is l2cap_sock.c and for the
      code there it makes no difference whether the callback is called before
      or after clearing the chan->conn pointer.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      72847ce0
    • J
      Bluetooth: Move parts of fixed channel initialization to l2cap_add_scid · 14824308
      Johan Hedberg 提交于
      The l2cap_add_scid function is used for registering a fixed L2CAP
      channel. Instead of having separate initialization of the channel type
      and outgoing MTU in l2cap_sock.c it's more intuitive to do these things
      in the l2cap_add_scid function itself (and thereby make the
      functionality available to other users besides l2cap_sock.c).
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      14824308
    • J
      Bluetooth: Remove special ATT data channel handling · 06171e05
      Johan Hedberg 提交于
      Now that we've got the fixed channel infrastructure cleaned up in a
      generic way there's no longer a need to have a dedicated function for
      handling data on the ATT channel. Instead the generic
      l2cap_data_channel() handler will be able to do the exact same thing.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      06171e05
    • J
      Bluetooth: Improve fixed channel lookup based on link type · 54a1b626
      Johan Hedberg 提交于
      When notifying global fixed channels of new connections it doesn't make
      sense to consider channels meant for a different link type than the one
      available. This patch adds an extra parameter to the
      l2cap_global_fixed_chan() lookup function and ensures that only channels
      matching the current hci_conn type are looked up.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      54a1b626
    • J
      Bluetooth: Move L2CAP fixed channel creation into l2cap_conn_cfm · e760ec12
      Johan Hedberg 提交于
      In order to remove special handling of fixed L2CAP channels we need to
      start creating them in a single place instead of having per-channel
      exceptions. The most natural place is the l2cap_conn_cfm() function
      which is called whenever there is a new baseband link.
      
      The only really special case so far has been the ATT socket, so in order
      not to break the code in between this patch removes the ATT special
      handling at the same time as it adds the generic fixed channel handling
      from l2cap_le_conn_ready() into the hci_conn_cfm() function. As a
      related change the channel locking in l2cap_conn_ready() becomes simpler
      and we can thereby move the smp_conn_security() call into the
      l2cap_le_conn_ready() function.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      e760ec12
    • J
      Bluetooth: Refactor l2cap_connect_cfm · dc0f5088
      Johan Hedberg 提交于
      This patch is a simple refactoring of l2cap_connect_cfm to allow easier
      extension of the function.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      dc0f5088
    • J
      Bluetooth: Remove special handling of ATT in l2cap_security_cfm() · 191eb398
      Johan Hedberg 提交于
      With the update to sk->resume() and __l2cap_no_conn_pending() we
      no-longer need to have special handling of ATT channels in the
      l2cap_security_cfm() function. The chan->sec_level update when
      encryption has been enabled is safe to do for any kind of channel, and
      the loop takes later care of calling chan->ready() or chan->resume() if
      necessary.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      191eb398
    • J
      Bluetooth: Resume BT_CONNECTED state after LE security elevation · d52deb17
      Johan Hedberg 提交于
      The LE ATT socket uses a special trick where it temporarily sets
      BT_CONFIG state for the duration of a security level elevation. In order
      to not require special hacks for going back to BT_CONNECTED state in the
      l2cap_core.c code the most reasonable place to resume the state is the
      resume callback. This patch adds a new flag to track the pending
      security level change and ensures that the state is set back to
      BT_CONNECTED in the resume callback in case the flag is set.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      d52deb17
    • J
      Bluetooth: Fix __l2cap_no_conn_pending() usage with all channels · 5ff6f34d
      Johan Hedberg 提交于
      The __l2cap_no_conn_pending() function would previously only return a
      meaningful value for connection oriented channels and was therefore not
      useful for anything else. As preparation of making the L2CAP code more
      generic allow the function to be called for other channel types as well
      by returning a meaningful value for them.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      5ff6f34d
    • J
      Bluetooth: Fix reference counting of global L2CAP channels · a24cce14
      Johan Hedberg 提交于
      When looking up entries from the global L2CAP channel list there needs
      to be a guarantee that other code doesn't go and remove the entry after
      a channel has been returned by the lookup function. This patch makes
      sure that the channel reference is incremented before the read lock is
      released in the global channel lookup functions. The patch also adds the
      corresponding l2cap_chan_put() calls once the channels pointers are
      no-longer needed.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      a24cce14
    • J
      Bluetooth: Fix confusion between parent and child channel for 6lowpan · 2b293490
      Johan Hedberg 提交于
      The new_connection L2CAP channel callback creates a new channel based on
      the provided parent channel. The 6lowpan code was confusingly naming the
      child channel "pchan" and the parent channel "chan". This patch swaps
      the names.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      2b293490
    • J
      Bluetooth: Remove redundant check for remote_key_dist · 5fcb9347
      Johan Hedberg 提交于
      In the smp_cmd_sign_info() function the SMP_DIST_SIGN bit is explicitly
      cleared early on in the function. This means that there's no need to
      check for it again before calling smp_distribute_keys().
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      5fcb9347
    • J
      Bluetooth: Disable page scan if all whitelisted devices are connected · 22f433dc
      Johan Hedberg 提交于
      When we're not connectable and all whitelisted (BR/EDR) devices are
      connected it doesn't make sense to keep page scan enabled. This patch
      adds code to check for any disconnected whitelist devices and if there
      are none take the appropriate action in the hci_update_page_scan()
      function to disable page scan.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      22f433dc
    • J
      Bluetooth: Create unified helper function for updating page scan · 432df05e
      Johan Hedberg 提交于
      Similar to our hci_update_background_scan() function we can simplify a
      lot of code by creating a unified helper function for doing page scan
      updates. This patch adds such a function to hci_core.c and updates all
      the relevant places to use it.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      432df05e
    • J
      Bluetooth: Add convenience function to check for pending power off · 84c61d92
      Johan Hedberg 提交于
      There are several situations where we're interested in knowing whether
      we're currently in the process of powering off an adapter. This patch
      adds a convenience function for the purpose and makes it public since
      we'll soon need to access it from hci_event.c as well.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      84c61d92
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f0094b28
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "Several networking final fixes and tidies for the merge window:
      
         1) Changes during the merge window unintentionally took away the
            ability to build bluetooth modular, fix from Geert Uytterhoeven.
      
         2) Several phy_node reference count bug fixes from Uwe Kleine-König.
      
         3) Fix ucc_geth build failures, also from Uwe Kleine-König.
      
         4) Fix klog false positivies when netlink messages go to network
            taps, by properly resetting the network header.  Fix from Daniel
            Borkmann.
      
         5) Sizing estimate of VF netlink messages is too small, from Jiri
            Benc.
      
         6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian.
      
         7) VLAN untagging is erroneously dependent upon whether the VLAN
            module is loaded or not, but there are generic dependencies that
            matter wrt what can be expected as the SKB enters the stack.
            Make the basic untagging generic code, and do it unconditionally.
            From Vlad Yasevich.
      
         8) xen-netfront only has so many slots in it's transmit queue so
            linearize packets that have too many frags.  From Zoltan Kiss.
      
         9) Fix suspend/resume PHY handling in bcmgenet driver, from Florian
            Fainelli"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (55 commits)
        net: bcmgenet: correctly resume adapter from Wake-on-LAN
        net: bcmgenet: update UMAC_CMD only when link is detected
        net: bcmgenet: correctly suspend and resume PHY device
        net: bcmgenet: request and enable main clock earlier
        net: ethernet: myricom: myri10ge: myri10ge.c: Cleaning up missing null-terminate after strncpy call
        xen-netfront: Fix handling packets on compound pages with skb_linearize
        net: fec: Support phys probed from devicetree and fixed-link
        smsc: replace WARN_ON() with WARN_ON_SMP()
        xen-netback: Don't deschedule NAPI when carrier off
        net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile
        wan: wanxl: Remove typedefs from struct names
        m68k/atari: EtherNEC - ethernet support (ne)
        net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy call
        hdlc: Remove typedefs from struct names
        airo_cs: Remove typedef local_info_t
        atmel: Remove typedef atmel_priv_ioctl
        com20020_cs: Remove typedef com20020_dev_t
        ethernet: amd: Remove typedef local_info_t
        net: Always untag vlan-tagged traffic on input.
        drivers: net: Add APM X-Gene SoC ethernet driver support.
        ...
      f0094b28
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 13b102bf
      Linus Torvalds 提交于
      Pull Sparc fixes from David Miller:
       "Sparc bug fixes, one of which was preventing successful SMP boots with
        mainline"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Fix pcr_ops initialization and usage bugs.
        sparc64: Do not disable interrupts in nmi_cpu_busy()
        sparc: Hook up seccomp and getrandom system calls.
        sparc: fix decimal printf format specifiers prefixed with 0x
      13b102bf
    • L
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 81c02a21
      Linus Torvalds 提交于
      Pull x86/apic updates from Thomas Gleixner:
       "This is a major overhaul to the x86 apic subsystem consisting of the
        following parts:
      
         - Remove obsolete APIC driver abstractions (David Rientjes)
      
         - Use the irqdomain facilities to dynamically allocate IRQs for
           IOAPICs.  This is a prerequisite to enable IOAPIC hotplug support,
           and it also frees up wasted vectors (Jiang Liu)
      
         - Misc fixlets.
      
        Despite the hickup in Ingos previous pull request - caused by the
        missing fixup for the suspend/resume issue reported by Borislav - I
        strongly recommend that this update finds its way into 3.17.  Some
        history for you:
      
        This is preparatory work for physical IOAPIC hotplug.  The first
        attempt to support this was done by Yinghai and I shot it down because
        it just added another layer of obscurity and complexity to the already
        existing mess without tackling the underlying shortcomings of the
        current implementation.
      
        After quite some on- and offlist discussions, I requested that the
        design of this functionality must use generic infrastructure, i.e.
        irq domains, which provide all the mechanisms to dynamically map linux
        interrupt numbers to physical interrupts.
      
        Jiang picked up the idea and did a great job of consolidating the
        existing interfaces to manage the x86 (IOAPIC) interrupt system by
        utilizing irq domains.
      
        The testing in tip, Linux-next and inside of Intel on various machines
        did not unearth any oddities until Borislav exposed it to one of his
        oddball machines.  The issue was resolved quickly, but unfortunately
        the fix fell through the cracks and did not hit the tip tree before
        Ingo sent the pull request.  Not entirely Ingos fault, I also assumed
        that the fix was already merged when Ingo asked me whether he could
        send it.
      
        Nevertheless this work has a proper design, has undergone several
        rounds of review and the final fallout after applying it to tip and
        integrating it into Linux-next has been more than moderate.  It's the
        ground work not only for IOAPIC hotplug, it will also allow us to move
        the lowlevel vector allocation into the irqdomain hierarchy, which
        will benefit other architectures as well.  Patches are posted already,
        but they are on hold for two weeks, see below.
      
        I really appreciate the competence and responsiveness Jiang has shown
        in course of this endavour.  So I'm sure that any fallout of this will
        be addressed in a timely manner.
      
        FYI, I'm vanishing for 2 weeks into my annual kids summer camp kitchen
        duty^Wvacation, while you folks are drooling at KS/LinuxCon :) But HPA
        will have a look at the hopefully zero fallout until I'm back"
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (53 commits)
        x86, irq, PCI: Keep IRQ assignment for PCI devices during suspend/hibernation
        x86/apic/vsmp: Make is_vsmp_box() static
        x86, apic: Remove enable_apic_mode callback
        x86, apic: Remove setup_portio_remap callback
        x86, apic: Remove multi_timer_check callback
        x86, apic: Replace noop_check_apicid_used
        x86, apic: Remove check_apicid_present callback
        x86, apic: Remove mps_oem_check callback
        x86, apic: Remove smp_callin_clear_local_apic callback
        x86, apic: Replace trampoline physical addresses with defaults
        x86, apic: Remove x86_32_numa_cpu_node callback
        x86: intel-mid: Use the new io_apic interfaces
        x86, vsmp: Remove is_vsmp_box() from apic_is_clustered_box()
        x86, irq: Clean up irqdomain transition code
        x86, irq, devicetree: Release IOAPIC pin when PCI device is disabled
        x86, irq, SFI: Release IOAPIC pin when PCI device is disabled
        x86, irq, mpparse: Release IOAPIC pin when PCI device is disabled
        x86, irq, ACPI: Release IOAPIC pin when PCI device is disabled
        x86, irq: Introduce helper functions to release IOAPIC pin
        x86, irq: Simplify the way to handle ISA IRQ
        ...
      81c02a21