1. 08 Feb, 2015 7 commits
    • Sowmini Varadhan's avatar
      rds: Make rds_message_copy_from_user() return 0 on success. · d0a47d32
      Sowmini Varadhan authored
      Commit 083735f4 ("rds: switch rds_message_copy_from_user() to iov_iter")
      breaks rds_message_copy_from_user() semantics on success, and causes it
      to return nbytes copied, when it should return 0.  This commit fixes that bug.
      Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d0a47d32
    • Rasmus Villemoes's avatar
      net: rds: Remove repeated function names from debug output · 11ac1199
      Rasmus Villemoes authored
      The macro rdsdebug is defined as
      
        pr_debug("%s(): " fmt, __func__ , ##args)
      
      Hence it doesn't make sense to include the name of the calling
      function explicitly in the format string passed to rdsdebug.
      Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11ac1199
    • Jarno Rajahalme's avatar
      net: openvswitch: Support masked set actions. · 83d2b9ba
      Jarno Rajahalme authored
      OVS userspace already probes the openvswitch kernel module for
      OVS_ACTION_ATTR_SET_MASKED support.  This patch adds the kernel module
      implementation of masked set actions.
      
      The existing set action sets many fields at once.  When only a subset
      of the IP header fields, for example, should be modified, all the IP
      fields need to be exact matched so that the other field values can be
      copied to the set action.  A masked set action allows modification of
      an arbitrary subset of the supported header bits without requiring the
      rest to be matched.
      
      Masked set action is now supported for all writeable key types, except
      for the tunnel key.  The set tunnel action is an exception as any
      input tunnel info is cleared before action processing starts, so there
      is no tunnel info to mask.
      
      The kernel module converts all (non-tunnel) set actions to masked set
      actions.  This makes action processing more uniform, and results in
      less branching and duplicating the action processing code.  When
      returning actions to userspace, the fully masked set actions are
      converted back to normal set actions.  We use a kernel internal action
      code to be able to tell the userspace provided and converted masked
      set actions apart.
      Signed-off-by: default avatarJarno Rajahalme <jrajahalme@nicira.com>
      Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      83d2b9ba
    • David S. Miller's avatar
      Merge branch 'dsa-next' · 2150f984
      David S. Miller authored
      Florian Fainelli says:
      
      ====================
      net: dsa: bcm_sf2: GPHY power down
      
      This patch series implement GPHY power up and down in the SF2 switch
      driver in order to conserve power whenever possible (e.g: port is brought
      down or unused during Wake-on-LAN).
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2150f984
    • Florian Fainelli's avatar
      net: dsa: bcm_sf2: implement GPHY power down · 9af197a8
      Florian Fainelli authored
      Implement the power on/off recommended procedure for the Single GPHY we
      have on our Starfighter 2 switch. In order to make sure we get proper
      LED link/activity signaling during suspend, switch the link indication
      from the Switch/MAC to the PHY.
      
      Finally, since the GPHY needs to be reset to be put in low power mode,
      we will loose any context applied to it: workarounds, EEE etc.. so we
      need to call phy_init_hw() to get our fixups re-applied successfully.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9af197a8
    • Florian Fainelli's avatar
      net: dsa: bcm_sf2: move GPHY enabling to its own function · b083668c
      Florian Fainelli authored
      Move the code that touches the single GPHY register from
      bcm_sf2_sw_resume() to a separate function since we will have to
      enable/disable the GPHY from different locations, and we want the code
      to be self-contained.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b083668c
    • David S. Miller's avatar
      Merge tag 'nfc-next-3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · 3c09e92f
      David S. Miller authored
      NFC: 3.20 second pull request
      
      This is the second NFC pull request for 3.20.
      
      It brings:
      
      - NCI NFCEE (NFC Execution Environment, typically an embedded or
        external secure element) discovery and enabling/disabling support.
        In order to communicate with an NFCEE, we also added NCI's logical
        connections support to the NCI stack.
      
      - HCI over NCI protocol support. Some secure elements only understand
        HCI and thus we need to send them HCI frames when they're part of
        an NCI chipset.
      
      - NFC_EVT_TRANSACTION userspace API addition. Whenever an application
        running on a secure element needs to notify its host counterpart,
        we send an NFC_EVENT_SE_TRANSACTION event to userspace through the
        NFC netlink socket.
      
      - Secure element and HCI transaction event support for the st21nfcb
        chipset.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3c09e92f
  2. 06 Feb, 2015 27 commits
  3. 05 Feb, 2015 6 commits