1. 12 11月, 2013 18 次提交
  2. 11 11月, 2013 6 次提交
  3. 10 11月, 2013 2 次提交
  4. 09 11月, 2013 11 次提交
  5. 08 11月, 2013 3 次提交
    • J
      Merge branch 'master' of... · c1f3bb6b
      John W. Linville 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
      c1f3bb6b
    • E
      inet: fix a UFO regression · dcd60771
      Eric Dumazet 提交于
      While testing virtio_net and skb_segment() changes, Hannes reported
      that UFO was sending wrong frames.
      
      It appears this was introduced by a recent commit :
      8c3a897b ("inet: restore gso for vxlan")
      
      The old condition to perform IP frag was :
      
      tunnel = !!skb->encapsulation;
      ...
              if (!tunnel && proto == IPPROTO_UDP) {
      
      So the new one should be :
      
      udpfrag = !skb->encapsulation && proto == IPPROTO_UDP;
      ...
              if (udpfrag) {
      
      Initialization of udpfrag must be done before call
      to ops->callbacks.gso_segment(skb, features), as
      skb_udp_tunnel_segment() clears skb->encapsulation
      
      (We want udpfrag to be true for UFO, false for VXLAN)
      
      With help from Alexei Starovoitov
      Reported-by: NHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Alexei Starovoitov <ast@plumgrid.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dcd60771
    • D
      Merge branch 'pskb_put' · 0b2e2d36
      David S. Miller 提交于
      Mathias Krause says:
      
      ====================
      move pskb_put (was: IPsec improvements)
      
      This series moves pskb_put() to the core code, making the code
      duplication in caif obsolete (patches 1 and 2).
      Patch 3 fixes a few kernel-doc issues.
      
      v2 of this series does no longer contain the skb_cow_data() patch and
      therefore no performance improvements for IPsec. The change is still
      under discussion, but otherwise independent from the above changes.
      
      Please apply!
      
      v2:
      - kernel-doc fixes for pskb_put, as noticed by Ben
      - dropped skb_cow_data patch as it's still discussed
      - added a kernel-doc fixes patch (patch 3)
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0b2e2d36