diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index 1fe33e6741cc..db0f4fcfdaf4 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -111,10 +111,4 @@ static inline bool icmpv6_is_err(int type)
 	return false;
 }
 
-static inline int sk_is_icmpv6(struct sock *sk)
-{
-	return sk->sk_family == AF_INET6 &&
-		inet_sk(sk)->inet_num == IPPROTO_ICMPV6;
-}
-
 #endif
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 94c6e6f549f0..4c5003afee6c 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -16,12 +16,6 @@ static inline int ip_mroute_opt(int opt)
 	return opt >= MRT_BASE && opt <= MRT_MAX;
 }
 
-static inline int sk_is_ipmr(struct sock *sk)
-{
-	return sk->sk_family == AF_INET &&
-		inet_sk(sk)->inet_num == IPPROTO_IGMP;
-}
-
 int ip_mroute_setsockopt(struct sock *, int, sockptr_t, unsigned int);
 int ip_mroute_getsockopt(struct sock *, int, sockptr_t, sockptr_t);
 int ipmr_ioctl(struct sock *sk, int cmd, void *arg);
@@ -57,11 +51,6 @@ static inline int ip_mroute_opt(int opt)
 	return 0;
 }
 
-static inline int sk_is_ipmr(struct sock *sk)
-{
-	return 0;
-}
-
 static inline bool ipmr_rule_default(const struct fib_rule *rule)
 {
 	return true;
diff --git a/net/core/sock.c b/net/core/sock.c
index cff3e82514d1..8ec8f4c9911f 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -4199,9 +4199,9 @@ int sk_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
 {
 	int rc = 1;
 
-	if (sk_is_ipmr(sk))
+	if (sk->sk_type == SOCK_RAW && sk->sk_family == AF_INET)
 		rc = ipmr_sk_ioctl(sk, cmd, arg);
-	else if (sk_is_icmpv6(sk))
+	else if (sk->sk_type == SOCK_RAW && sk->sk_family == AF_INET6)
 		rc = ip6mr_sk_ioctl(sk, cmd, arg);
 	else if (sk_is_phonet(sk))
 		rc = phonet_sk_ioctl(sk, cmd, arg);