1 files changed, 7 insertions, 6 deletions

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 40403114f00a..915d215a7d14 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -366,12 +366,12 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
 
         if (data[IFLA_IPTUN_ENCAP_SPORT]) {
                 ret = true;
-                ipencap->sport = nla_get_u16(data[IFLA_IPTUN_ENCAP_SPORT]);
+                ipencap->sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);
         }
 
         if (data[IFLA_IPTUN_ENCAP_DPORT]) {
                 ret = true;
-                ipencap->dport = nla_get_u16(data[IFLA_IPTUN_ENCAP_DPORT]);
+                ipencap->dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);
         }
 
         return ret;
@@ -460,10 +460,10 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
 
         if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE,
                         tunnel->encap.type) ||
-            nla_put_u16(skb, IFLA_IPTUN_ENCAP_SPORT,
-                        tunnel->encap.sport) ||
-            nla_put_u16(skb, IFLA_IPTUN_ENCAP_DPORT,
-                        tunnel->encap.dport) ||
+            nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT,
+                         tunnel->encap.sport) ||
+            nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT,
+                         tunnel->encap.dport) ||
             nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS,
                         tunnel->encap.flags))
                 goto nla_put_failure;
@@ -498,6 +498,7 @@ static struct rtnl_link_ops ipip_link_ops __read_mostly = {
         .dellink        = ip_tunnel_dellink,
         .get_size       = ipip_get_size,
         .fill_info      = ipip_fill_info,
+        .get_link_net   = ip_tunnel_get_link_net,
 };
 
 static struct xfrm_tunnel ipip_handler __read_mostly = {