Merge 4.4.168 into android-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e33ec3b..6032ec8 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1472,7 +1472,9 @@ static void tun_setup(struct net_device *dev)
  */
 static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
 {
-       return -EINVAL;
+       /* NL_SET_ERR_MSG(extack,
+                      "tun/tap creation via rtnetlink is not supported."); */
+       return -EOPNOTSUPP;
 }
 
 static struct rtnl_link_ops tun_link_ops __read_mostly = {