1. 22 Oct, 2013 4 commits
  2. 21 Oct, 2013 33 commits
  3. 19 Oct, 2013 3 commits
    • David S. Miller's avatar
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · 5bf47256
      David S. Miller authored
      Antonio Quartulli says:
      
      ====================
      this is another batch intended for net-next/linux-3.13.
      
      This pull request is a bit bigger than usual, but 6 patches are very small
      (three of them are about email updates)..
      
      Patch 1 is fixing a previous merge conflict resolution that went wrong
      (I realised that only now while checking other patches..).
      Patches from 2 to 4 that are updating our emails in all the proper files
      (Documentation/, headers and MAINTAINERS).
      
      Patches 5, 6 and 7 are bringing a big improvement to the TranslationTable
      component: it is now able to group non-mesh clients based on the VLAN they
      belong to. In this way a lot a new enhancements are now possible thanks to the
      fact that each batman-adv behaviour can be applied on a per VLAN basis.
      
      And, of course, in patches from 8 to 12 you have some of the enhancements I was
      talking about:
      - make the batman-Gateway selection VLAN dependent
      - make DAT (Distributed ARP Table) group ARP entries on a VLAN basis (this
        allows DAT to work even when the admin decided to use the same IP subnet on
        different VLANs)
      - make the AP-Isolation behaviour switchable on each VLAN independently
      - export VLAN specific attributes via sysfs. Switches like the AP-Isolation are
        now exported once per VLAN (backward compatibility of the sysfs interface has
        been preserved)
      
      Patches 13 and 14 are small code cleanups.
      Patch 15 is a minor improvement in the TT locking mechanism.
      
      Patches 16 and 17 are other enhancements to the TT component. Those allow a
      node to parse a "non-mesh client announcement message" and accept only those
      TT entries belonging to certain VLANs.
      
      Patch 18 exploits this parse&accept mechanism to make the Bridge Loop Avoidance
      component reject only TT entries connected to the VLAN where it is operating.
      Previous to this change, BLA was rejecting all the entries coming from any other
      Backbone node, regardless of the VLAN (for more details about how the Bridge
      Loop Avoidance works please check [1]).
      
      [1] http://www.open-mesh.org/projects/batman-adv/wiki/Bridge-loop-avoidance-II
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5bf47256
    • David S. Miller's avatar
      Merge branch 'net_get_random_once' · 7dcade39
      David S. Miller authored
      Hannes Frederic Sowa says:
      
      ====================
      This series implements support for delaying the initialization of secret
      keys, e.g. used for hashing, for as long as possible. This functionality
      is implemented by a new macro, net_get_random_bytes.
      
      I already used it to protect the socket hashes, the syncookie secret
      (most important) and the tcp_fastopen secrets.
      
      Changelog:
      v2) Use static_keys in net_get_random_once to have as minimal impact to
          the fast-path as possible.
      v3) added patch "static_key: WARN on usage before jump_label_init was called":
          Patch "x86/jump_label: expect default_nop if static_key gets enabled
          on boot-up" relaxes the checks for using static_key primitives before
          jump_label_init. So tighten them first.
      v4) Update changelog on the patch "static_key: WARN on usage before
          jump_label_init was called"
      
      Included patches:
       ipv4: split inet_ehashfn to hash functions per compilation unit
       ipv6: split inet6_ehashfn to hash functions per compilation unit
       static_key: WARN on usage before jump_label_init was called
       x86/jump_label: expect default_nop if static_key gets enabled on boot-up
       net: introduce new macro net_get_random_once
       inet: split syncookie keys for ipv4 and ipv6 and initialize with net_get_random_once
       inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once
       tcp: switch tcp_fastopen key generation to net_get_random_once
       net: switch net_secret key generation to net_get_random_once
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7dcade39
    • Hannes Frederic Sowa's avatar
      net: switch net_secret key generation to net_get_random_once · e34c9a69
      Hannes Frederic Sowa authored
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e34c9a69