4 files changed, 9 insertions, 10 deletions

diff --git a/net/openvswitch/Kconfig b/net/openvswitch/Kconfig
index b7d818c59423..ed6b0f8dd1bb 100644
--- a/net/openvswitch/Kconfig
+++ b/net/openvswitch/Kconfig
@@ -6,6 +6,7 @@ config OPENVSWITCH
         tristate "Open vSwitch"
         depends on INET
         select LIBCRC32C
+        select MPLS
         select NET_MPLS_GSO
         ---help---
           Open vSwitch is a multilayer Ethernet switch targeted at virtualized
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 5bae7243c577..096c6276e6b9 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -203,7 +203,6 @@ static void destroy_dp_rcu(struct rcu_head *rcu)
 
         ovs_flow_tbl_destroy(&dp->table);
         free_percpu(dp->stats_percpu);
-        release_net(ovs_dp_get_net(dp));
         kfree(dp->ports);
         kfree(dp);
 }
@@ -1501,7 +1500,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
         if (dp == NULL)
                 goto err_free_reply;
 
-        ovs_dp_set_net(dp, hold_net(sock_net(skb->sk)));
+        ovs_dp_set_net(dp, sock_net(skb->sk));
 
         /* Allocate table. */
         err = ovs_flow_tbl_init(&dp->table);
@@ -1575,7 +1574,6 @@ err_destroy_percpu:
 err_destroy_table:
         ovs_flow_tbl_destroy(&dp->table);
 err_free_dp:
-        release_net(ovs_dp_get_net(dp));
         kfree(dp);
 err_free_reply:
         kfree_skb(reply);
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index 3ece94563079..4ec4a480b147 100644
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -84,10 +84,8 @@ struct datapath {
         /* Stats. */
         struct dp_stats_percpu __percpu *stats_percpu;
 
-#ifdef CONFIG_NET_NS
         /* Network namespace ref. */
-        struct net *net;
-#endif
+        possible_net_t net;
 
         u32 user_features;
 };
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 22b18c145c92..c691b1a1eee0 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -535,11 +535,11 @@ static int ipv4_tun_from_nlattr(const struct nlattr *attr,
                         break;
                 case OVS_TUNNEL_KEY_ATTR_IPV4_SRC:
                         SW_FLOW_KEY_PUT(match, tun_key.ipv4_src,
-                                        nla_get_be32(a), is_mask);
+                                        nla_get_in_addr(a), is_mask);
                         break;
                 case OVS_TUNNEL_KEY_ATTR_IPV4_DST:
                         SW_FLOW_KEY_PUT(match, tun_key.ipv4_dst,
-                                        nla_get_be32(a), is_mask);
+                                        nla_get_in_addr(a), is_mask);
                         break;
                 case OVS_TUNNEL_KEY_ATTR_TOS:
                         SW_FLOW_KEY_PUT(match, tun_key.ipv4_tos,
@@ -648,10 +648,12 @@ static int __ipv4_tun_to_nlattr(struct sk_buff *skb,
             nla_put_be64(skb, OVS_TUNNEL_KEY_ATTR_ID, output->tun_id))
                 return -EMSGSIZE;
         if (output->ipv4_src &&
-            nla_put_be32(skb, OVS_TUNNEL_KEY_ATTR_IPV4_SRC, output->ipv4_src))
+            nla_put_in_addr(skb, OVS_TUNNEL_KEY_ATTR_IPV4_SRC,
+                            output->ipv4_src))
                 return -EMSGSIZE;
         if (output->ipv4_dst &&
-            nla_put_be32(skb, OVS_TUNNEL_KEY_ATTR_IPV4_DST, output->ipv4_dst))
+            nla_put_in_addr(skb, OVS_TUNNEL_KEY_ATTR_IPV4_DST,
+                            output->ipv4_dst))
                 return -EMSGSIZE;
         if (output->ipv4_tos &&
             nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TOS, output->ipv4_tos))