Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

Jesse Gross says:

====================
Open vSwitch

A set of updates for net-next/3.13. Major changes are:
 * Restructure flow handling code to be more logically organized and
   easier to read.
 * Rehashing of the flow table is moved from a workqueue to flow
   installation time. Before, heavy load could block the workqueue for
   excessive periods of time.
 * Additional debugging information is provided to help diagnose megaflows.
 * It's now possible to match on TCP flags.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --combined net/openvswitch/vport-vxlan.c
index 56e22b74cf965f57ceb90ad0be84b378bbac093f,b0da39469ec824d1f8bdadf174d4a5f066153fd7..e797a50ac2beec3a019bacf15e2e7c593355a46f
--- 1/net/openvswitch/vport-vxlan.c
--- 2/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@@ -29,7 -29,6 +29,6 @@@
  #include <net/ip.h>
  #include <net/udp.h>
  #include <net/ip_tunnels.h>
- #include <net/udp.h>
  #include <net/rtnetlink.h>
  #include <net/route.h>
  #include <net/dsfield.h>
@@@ -173,7 -172,7 +172,7 @@@ static int vxlan_tnl_send(struct vport 
  
        skb->local_df = 1;
  
 -      inet_get_local_port_range(&port_min, &port_max);
 +      inet_get_local_port_range(net, &port_min, &port_max);
        src_port = vxlan_src_port(port_min, port_max, skb);
  
        err = vxlan_xmit_skb(vxlan_port->vs, rt, skb,