瀏覽代碼

[IPV4] devinet: Register inetdev earlier.

This patch allocates inetdev at registration for all devices
in line with IPv6.  This allows sysctl configuration on the
devices to occur before they're brought up or addresses are
added.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Herbert Xu 18 年之前
父節點
當前提交
8030f54499
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      net/ipv4/devinet.c

+ 5 - 3
net/ipv4/devinet.c

@@ -1054,12 +1054,14 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
 	ASSERT_RTNL();
 	ASSERT_RTNL();
 
 
 	if (!in_dev) {
 	if (!in_dev) {
-		if (event == NETDEV_REGISTER && dev == &loopback_dev) {
+		if (event == NETDEV_REGISTER) {
 			in_dev = inetdev_init(dev);
 			in_dev = inetdev_init(dev);
 			if (!in_dev)
 			if (!in_dev)
 				panic("devinet: Failed to create loopback\n");
 				panic("devinet: Failed to create loopback\n");
-			in_dev->cnf.no_xfrm = 1;
-			in_dev->cnf.no_policy = 1;
+			if (dev == &loopback_dev) {
+				in_dev->cnf.no_xfrm = 1;
+				in_dev->cnf.no_policy = 1;
+			}
 		}
 		}
 		goto out;
 		goto out;
 	}
 	}