42a05dcd81
This commit updates the standard kernel to 3.10.0-838 and the rt kernel to 3.10.0-802. Driver updates to ensure compilation also added (Mellanox driver, specifically) Depends-On: https://review.openstack.org/580689 Change-Id: Ie52d7df2f097ea03158b3b3a3334b61833cbdf57 Story: 2002761 Signed-off-by: Jason McKenna <jason.mckenna@windriver.com> Story: 2002761 Task: 22841
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0e86f726ba6e46ee206ecc7e09ce049ed4145f6c Mon Sep 17 00:00:00 2001
|
|
Message-Id: <0e86f726ba6e46ee206ecc7e09ce049ed4145f6c.1527544850.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <b6ceef1c915827b50ce3f76da4dc47f3eb768b44.1527544850.git.Jim.Somerville@windriver.com>
|
|
References: <b6ceef1c915827b50ce3f76da4dc47f3eb768b44.1527544850.git.Jim.Somerville@windriver.com>
|
|
From: Chris Friesen <chris.friesen@windriver.com>
|
|
Date: Thu, 12 May 2016 18:00:00 -0400
|
|
Subject: [PATCH 07/26] Make kernel start eth devices at offset
|
|
|
|
In order to avoid naming collisions, we want to make the kernel
|
|
start naming its "ethX" devices at eth1000 instead of eth0. This
|
|
will let us rename to a range starting at eth0.
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
net/core/dev.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
|
index 92d6c59..238c90d 100644
|
|
--- a/net/core/dev.c
|
|
+++ b/net/core/dev.c
|
|
@@ -1090,6 +1090,12 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)
|
|
set_bit(i, inuse);
|
|
}
|
|
|
|
+ /* WRS extension, want kernel to start at eth1000 */
|
|
+ if (strcmp(name, "eth%d") == 0) {
|
|
+ for (i=0; i < 1000; i++)
|
|
+ set_bit(i, inuse);
|
|
+ }
|
|
+
|
|
i = find_first_zero_bit(inuse, max_netdevices);
|
|
free_page((unsigned long) inuse);
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|