2 files changed, 11 insertions, 3 deletions

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index b41d2d10ff0e..ac5b02515355 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1728,9 +1728,9 @@ static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)
 {
         struct sock *sk = skb->sk;
 
-        if (sk && sk->sk_family == AF_INET6)
+        if (sk && skb->protocol == htons(ETH_P_IPV6))
                 return ip6_skb_dst_mtu(skb);
-        else if (sk && sk->sk_family == AF_INET)
+        else if (sk && skb->protocol == htons(ETH_P_IP))
                 return ip_skb_dst_mtu(skb);
         return dst_mtu(skb_dst(skb));
 }
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 6f5fc612b162..3bb2cdc13b46 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -216,9 +216,17 @@ int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb)
 
 void xfrm_local_error(struct sk_buff *skb, int mtu)
 {
+        unsigned int proto;
         struct xfrm_state_afinfo *afinfo;
 
-        afinfo = xfrm_state_get_afinfo(skb->sk->sk_family);
+        if (skb->protocol == htons(ETH_P_IP))
+                proto = AF_INET;
+        else if (skb->protocol == htons(ETH_P_IPV6))
+                proto = AF_INET6;
+        else
+                return;
+
+        afinfo = xfrm_state_get_afinfo(proto);
         if (!afinfo)
                 return;