1 files changed, 10 insertions, 5 deletions

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 277c1c46fe94..a131f9ff979e 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1488,10 +1488,15 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
                 if (!ut[i].family)
                         ut[i].family = family;
 
-                if ((ut[i].mode == XFRM_MODE_TRANSPORT) &&
-                    (ut[i].family != prev_family))
-                        return -EINVAL;
-
+                switch (ut[i].mode) {
+                case XFRM_MODE_TUNNEL:
+                case XFRM_MODE_BEET:
+                        break;
+                default:
+                        if (ut[i].family != prev_family)
+                                return -EINVAL;
+                        break;
+                }
                 if (ut[i].mode >= XFRM_MODE_MAX)
                         return -EINVAL;
 
@@ -1927,7 +1932,7 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct xfrm_usersa_flush *p = nlmsg_data(nlh);
         int err;
 
-        err = xfrm_state_flush(net, p->proto, true);
+        err = xfrm_state_flush(net, p->proto, true, false);
         if (err) {
                 if (err == -ESRCH) /* empty table */
                         return 0;