From ac6da3539b285c3902b7bba45df3963dd3feecb9 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 15 Dec 2006 15:42:50 +1100 Subject: [PATCH] --- yaml --- r: 44758 b: refs/heads/master c: 687d18abed09315a531470a0edcae977ef6a7f9e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/iseries_veth.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bce00cb19a47..22839e2d76c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd38451f1512fd5230e3c5dcc66d1ca867af879b +refs/heads/master: 687d18abed09315a531470a0edcae977ef6a7f9e diff --git a/trunk/drivers/net/iseries_veth.c b/trunk/drivers/net/iseries_veth.c index d6f4f185bf37..2194b567239f 100644 --- a/trunk/drivers/net/iseries_veth.c +++ b/trunk/drivers/net/iseries_veth.c @@ -73,7 +73,7 @@ #include #include #include - +#include #include #include #include @@ -1668,7 +1668,7 @@ static struct vio_driver veth_driver = { * Module initialization/cleanup */ -void __exit veth_module_cleanup(void) +static void __exit veth_module_cleanup(void) { int i; struct veth_lpar_connection *cnx; @@ -1697,11 +1697,14 @@ void __exit veth_module_cleanup(void) } module_exit(veth_module_cleanup); -int __init veth_module_init(void) +static int __init veth_module_init(void) { int i; int rc; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return -ENODEV; + this_lp = HvLpConfig_getLpIndex_outline(); for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {