1. 12 Jan, 2015 12 commits
  2. 11 Jan, 2015 17 commits
  3. 08 Jan, 2015 11 commits
    • David S. Miller's avatar
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · fb57720d
      David S. Miller authored
      
      
      Included changes:
      - remove useless return in void functions
      - remove unused member 'primary_iface' from 'struct orig_node'
      - improve existing kernel doc
      - fix several checkpatch complaints
      - ensure socket's control block is cleared for received skbs
      - add missing DEBUG_FS dependency to BATMAN_ADV_DEBUG symbol
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fb57720d
    • Praveen Madhavan's avatar
      csiostor:firmware upgrade fix · f40e74ff
      Praveen Madhavan authored
      
      
      This patch fixes removes older means of upgrading Firmware using MAJOR version
      and adds newer interface version checking mechanism.
      
      Please apply this patch on net-next since it depends on previous commits.
      Signed-off-by: default avatarPraveen Madhavan <praveenm@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f40e74ff
    • Fabio Estevam's avatar
      Revert "ARM: dts: imx6qdl: enable FEC magic-packet feature" · 3552c319
      Fabio Estevam authored
      As 456062b3 ("ARM: imx: add FEC sleep mode callback function") has been
      reverted, also revert the dts part.
      
      This reverts commit 07b4d2dd
      
       ("ARM: dts: imx6qdl: enable FEC
      magic-packet feature").
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3552c319
    • Fabio Estevam's avatar
      Revert "ARM: imx: add FEC sleep mode callback function" · 99b164a6
      Fabio Estevam authored
      i.MX platform maintainer Shawn Guo is not happy with the such commit as
      explained below [1]:
      
      "The GPR difference between SoCs can be encoded in device tree as well.
      It's pointless to repeat the same code pattern for every single
      platform, that need to set up GPR bits for enabling magic packet wake
      up, while the only difference is the register and bit offset.
      
      The platform code will become quite messy and unmaintainable if every
      device driver dump their GPR register setup code into platform.
      
      Sorry, but it's NACK from me."
      
      This reverts commit 456062b3 ("ARM: imx: add FEC sleep mode callback
      function").
      
      [1] http://www.spinics.net/lists/netdev/msg310922.html
      
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      99b164a6
    • Florian Westphal's avatar
      r8169: add support for xmit_more · 0bec3b70
      Florian Westphal authored
      
      
      Delay update of hw tail descriptor if we know that another skb is going
      to be sent.
      Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0bec3b70
    • David S. Miller's avatar
      Merge branch 'rhashtable-next' · 4a71d054
      David S. Miller authored
      
      
      Ying Xue says:
      
      ====================
      Involve rhashtable_lookup_insert routine
      
      The series aims to involve rhashtable_lookup_insert() to guarantee
      that the process of lookup and insertion of an object from/into hash
      table is finished atomically, allowing rhashtable's users not to
      introduce an extra lock during search and insertion. For example,
      tipc socket is the first user benefiting from this enhancement.
      
      v2 changes:
       - fix the issue of waking up worker thread under a wrong condition in
         patch #2, which is pointed by Thomas.
       - move a comment from rhashtable_inser() to rhashtable_wakeup_worker()
         according to Thomas's suggestion in patch #2.
       - indent the third line of condition statement in
         rhashtable_wakeup_worker() to inner bracket in patch #2.
       - drop patch #3 of v1 series
       - fix an issue of being unable to remove an object from hash table in
         certain special case in patch #4.
       - involve a new patch #5 to avoid unnecessary wakeup for worker queue
         thread
       - involve a new patch #6 to initialize atomic "nelems" variable
       - adjust "nelem_hint" value from 256 to 192 avoiding to unnecessarily
         to shrink hash table from the beginning phase in patch #7.
      
      v1 changes:
       But before rhashtable_lookup_insert() is involved, the following
       optimizations need to be first done:
      - simplify rhashtable_lookup by reusing rhashtable_lookup_compare()
      - introduce rhashtable_wakeup_worker() to further reduce duplicated
        code in patch #2
      - fix an issue in patch #3
      - involve rhashtable_lookup_insert(). But in this version, we firstly
        use rhashtable_lookup() to search duplicate key in both old and new
        bucket table; secondly introduce another __rhashtable_insert() helper
        function to reduce the duplicated code between rhashtable_insert()
        and rhashtable_lookup_insert().
      - add patch #5 into the series as it depends on above patches. But in
        this version, no change is made comparing with its previous version.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4a71d054
    • Ying Xue's avatar
      tipc: convert tipc reference table to use generic rhashtable · 07f6c4bc
      Ying Xue authored
      
      
      As tipc reference table is statically allocated, its memory size
      requested on stack initialization stage is quite big even if the
      maximum port number is just restricted to 8191 currently, however,
      the number already becomes insufficient in practice. But if the
      maximum ports is allowed to its theory value - 2^32, its consumed
      memory size will reach a ridiculously unacceptable value. Apart from
      this, heavy tipc users spend a considerable amount of time in
      tipc_sk_get() due to the read-lock on ref_table_lock.
      
      If tipc reference table is converted with generic rhashtable, above
      mentioned both disadvantages would be resolved respectively: making
      use of the new resizable hash table can avoid locking on the lookup;
      smaller memory size is required at initial stage, for example, 256
      hash bucket slots are requested at the beginning phase instead of
      allocating the entire 8191 slots in old mode. The hash table will
      grow if entries exceeds 75% of table size up to a total table size
      of 1M, and it will automatically shrink if usage falls below 30%,
      but the minimum table size is allowed down to 256.
      
      Also converts ref_table_lock to a separate mutex to protect hash table
      mutations on write side. Lastly defers the release of the socket
      reference using call_rcu() to allow using an RCU read-side protected
      call to rhashtable_lookup().
      Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
      Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
      Acked-by: default avatarErik Hugne <erik.hugne@ericsson.com>
      Cc: Thomas Graf <tgraf@suug.ch>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      07f6c4bc
    • Ying Xue's avatar
      rhashtable: initialize atomic nelems variable · 545a148e
      Ying Xue authored
      
      Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
      Cc: Thomas Graf <tgraf@suug.ch>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      545a148e
    • Ying Xue's avatar
      rhashtable: avoid unnecessary wakeup for worker queue · c0c09bfd
      Ying Xue authored
      
      
      Move condition statements of verifying whether hash table size exceeds
      its maximum threshold or reaches its minimum threshold from resizing
      functions to resizing decision functions, avoiding unnecessary wakeup
      for worker queue thread.
      Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
      Cc: Thomas Graf <tgraf@suug.ch>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c0c09bfd
    • Ying Xue's avatar
      rhashtable: future table needs to be traversed when remove an object · bd6d4db5
      Ying Xue authored
      
      
      When remove an object from hash table, we currently only traverse old
      bucket table to check whether the object exists. If the object is not
      found in it, we will try again. But in the second search loop, we still
      search the object from the old table instead of future table. As a
      result, the object may be not removed from hash table especially when
      resizing is currently in progress and the object is just saved in the
      future table.
      Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
      Cc: Thomas Graf <tgraf@suug.ch>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bd6d4db5
    • Ying Xue's avatar
      rhashtable: involve rhashtable_lookup_insert routine · db304854
      Ying Xue authored
      
      
      Involve a new function called rhashtable_lookup_insert() which makes
      lookup and insertion atomic under bucket lock protection, helping us
      avoid to introduce an extra lock when we search and insert an object
      into hash table.
      Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
      Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
      Acked-by: default avatarThomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      db304854