1. 12 11月, 2013 14 次提交
  2. 11 11月, 2013 6 次提交
  3. 10 11月, 2013 2 次提交
  4. 09 11月, 2013 11 次提交
  5. 08 11月, 2013 7 次提交
    • 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
    • M
      net: skbuff - kernel-doc fixes · bc32383c
      Mathias Krause 提交于
      Use "@" to refer to parameters in the kernel-doc description. According
      to Documentation/kernel-doc-nano-HOWTO.txt "&" shall be used to refer to
      structures only.
      Signed-off-by: NMathias Krause <mathias.krause@secunet.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bc32383c
    • M
      caif: use pskb_put() instead of reimplementing its functionality · 253c6daa
      Mathias Krause 提交于
      Also remove the warning for fragmented packets -- skb_cow_data() will
      linearize the buffer, removing all fragments.
      Signed-off-by: NMathias Krause <mathias.krause@secunet.com>
      Cc: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      253c6daa
    • M
      net: move pskb_put() to core code · 0c7ddf36
      Mathias Krause 提交于
      This function has usage beside IPsec so move it to the core skbuff code.
      While doing so, give it some documentation and change its return type to
      'unsigned char *' to be in line with skb_put().
      Signed-off-by: NMathias Krause <mathias.krause@secunet.com>
      Cc: Steffen Klassert <steffen.klassert@secunet.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Herbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0c7ddf36
    • A
      net: calxedaxgmac: Fix panic caused by MTU change of active interface · b5ad795e
      Andreas Herrmann 提交于
      Changing MTU size of an xgmac network interface while it is active can
      cause a panic like
      
        skbuff: skb_over_panic: text:c03bc62c len:1090 put:1090 head:edfb6900 data:edfb6942 tail:0xedfb6d84 end:0xedfb6bc0 dev:eth0
        ------------[ cut here ]------------
        kernel BUG at net/core/skbuff.c:126!
        Internal error: Oops - BUG: 0 [#1] SMP ARM
        Modules linked in:
        CPU: 0 PID: 762 Comm: python Tainted: G        W    3.10.0-00015-g3e33cd7 #309
        task: edcfe000 ti: ed67e000 task.ti: ed67e000
        PC is at skb_panic+0x64/0x70
        LR is at wake_up_klogd+0x5c/0x68
      
      This happens because xgmac_change_mtu modifies dev->mtu before the
      network interface is quiesced. And thus there still might be buffers
      in use which have a buffer size based on the old MTU.
      
      To fix this I moved the change of dev->mtu after the call to
      xgmac_stop.
      
      Another modification is required (in xgmac_stop) to ensure that
      xgmac_xmit is really not called anymore (xgmac_tx_complete might wake
      up the queue again).
      
      I've tested the fix by switching MTU size every second between 600 and
      1500 while network traffic was going on. The test box survived a test
      of several hours (until I've stopped it) whereas w/o this fix above
      panic occurs after several minutes (at most).
      
      Change since v1:
      - remove call to netif_stop_queue at beginning of xgmac_stop
      - use netif_tx_disable instead of locking+netif_stop_queue
      Signed-off-by: NAndreas Herrmann <andreas.herrmann@calxeda.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b5ad795e