summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-06-02 17:58:36 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-02 17:58:36 -0700
commit0c2aaf205b1aba1f2376fc100daedb3e64c2ba35 (patch)
tree11eb3cd41f16eb1ccda0f53b22ab121bfa1f7a26
parentf4815879030d044aa201b1aedf770396a0bbbafd (diff)
[PATCH] ppc64: update info about available iseries_veth interfaces
From: Olaf Hering <olh@suse.de> /proc/iSeries/config contains now the number of configured virtual ethernet adapters. AVAILABLE_VETH should only indicate if there is at least one interface available, iseries_veth must be loaded in this case. Printing the entire map will give installers some hints about what interface numbers will appear and how the MAC address may look like. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ppc64/kernel/viopath.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/ppc64/kernel/viopath.c b/arch/ppc64/kernel/viopath.c
index f0cb2d70a019..3fbdd00d3a91 100644
--- a/arch/ppc64/kernel/viopath.c
+++ b/arch/ppc64/kernel/viopath.c
@@ -191,7 +191,6 @@ static int proc_viopath_show(struct seq_file *m, void *v)
{
char *buf;
u16 vlanMap;
- int vlanIndex;
dma_addr_t handle;
HvLpEvent_Rc hvrc;
DECLARE_MUTEX_LOCKED(Semaphore);
@@ -219,17 +218,10 @@ static int proc_viopath_show(struct seq_file *m, void *v)
down(&Semaphore);
vlanMap = HvLpConfig_getVirtualLanIndexMap();
- vlanIndex = 0;
- while (vlanMap != 0){
- if (vlanMap & 0x8000)
- vlanIndex++;;
- vlanMap = vlanMap << 1;
- }
buf[PAGE_SIZE-1] = '\0';
seq_printf(m, "%s", buf);
-
- seq_printf(m, "AVAILABLE_VETH=%d\n", vlanIndex );
+ seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap);
seq_printf(m, "SRLNBR=%c%c%c%c%c%c%c\n",
e2a(xItExtVpdPanel.mfgID[2]),
e2a(xItExtVpdPanel.mfgID[3]),