19 Feb, 2010

11 commits

  • Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • Make remaining netlink policies as const.
    Fixup coding style where needed.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     
  • Dunno, what was the idea, it wasn't used for a long time.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     
  • Signed-off-by: Alexey Dobriyan
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     
  • ICMP6 MIB statistics was per-netns for quite a time.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     
  • The lock used in unix_state_lock() is a spin_lock not reader-writer.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: David S. Miller

    Stephen Hemminger
     
  • Added flags field to macvtap_queue to enable/disable processing of
    virtio_net_hdr via IFF_VNET_HDR. This flag is checked to prepend virtio_net_hdr
    in the receive path and process/skip virtio_net_hdr in the send path.

    Original patch by Sridhar, further changes by Arnd.

    Signed-off-by: Sridhar Samudrala
    Signed-off-by: Arnd Bergmann
    Signed-off-by: David S. Miller

    Arnd Bergmann
     
  • This adds support for passing a macvtap file descriptor into
    vhost-net, much like we already do for tun/tap.

    Most of the new code is taken from the respective patch
    in the tun driver and may get consolidated in the future.

    Signed-off-by: Arnd Bergmann
    Acked-by: Sridhar Samudrala
    Signed-off-by: David S. Miller

    Arnd Bergmann
     
  • This reworks the change done by the previous patch
    in a more complete way.

    The original macvtap code has a number of problems
    resulting from the use of RCU for protecting the
    access to struct macvtap_queue from open files.

    This includes
    - need for GFP_ATOMIC allocations for skbs
    - potential deadlocks when copy_*_user sleeps
    - inability to work with vhost-net

    Changing the lifetime of macvtap_queue to always
    depend on the open file solves all these. The
    RCU reference simply moves one step down to
    the reference on the macvlan_dev, which we
    only need for nonblocking operations.

    Signed-off-by: Arnd Bergmann
    Acked-by: Sridhar Samudrala
    Signed-off-by: David S. Miller

    Arnd Bergmann
     
  • As reported by Randy Dunlap , compilation
    of nf_defrag_ipv4 fails with:

    include/net/netfilter/nf_conntrack.h:94: error: field 'ct_general' has incomplete type
    include/net/netfilter/nf_conntrack.h:178: error: 'const struct sk_buff' has no member named 'nfct'
    include/net/netfilter/nf_conntrack.h:185: error: implicit declaration of function 'nf_conntrack_put'
    include/net/netfilter/nf_conntrack.h:294: error: 'const struct sk_buff' has no member named 'nfct'
    net/ipv4/netfilter/nf_defrag_ipv4.c:45: error: 'struct sk_buff' has no member named 'nfct'
    net/ipv4/netfilter/nf_defrag_ipv4.c:46: error: 'struct sk_buff' has no member named 'nfct'

    net/nf_conntrack.h must not be included with NF_CONNTRACK=n, add a
    few #ifdefs. Long term the header file should be fixed to be usable
    even with NF_CONNTRACK=n.

    Tested-by: Randy Dunlap
    Signed-off-by: Patrick McHardy

    Patrick McHardy
     

18 Feb, 2010

29 commits