git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
net
/
iseries_veth.c
diff --git
a/drivers/net/iseries_veth.c
b/drivers/net/iseries_veth.c
index
d6f4f18
..
2194b56
100644
(file)
--- a/
drivers/net/iseries_veth.c
+++ b/
drivers/net/iseries_veth.c
@@
-73,7
+73,7
@@
#include <asm/abs_addr.h>
#include <asm/iseries/mf.h>
#include <asm/uaccess.h>
#include <asm/abs_addr.h>
#include <asm/iseries/mf.h>
#include <asm/uaccess.h>
-
+#include <asm/firmware.h>
#include <asm/iseries/hv_lp_config.h>
#include <asm/iseries/hv_types.h>
#include <asm/iseries/hv_lp_event.h>
#include <asm/iseries/hv_lp_config.h>
#include <asm/iseries/hv_types.h>
#include <asm/iseries/hv_lp_event.h>
@@
-1668,7
+1668,7
@@
static struct vio_driver veth_driver = {
* Module initialization/cleanup
*/
* Module initialization/cleanup
*/
-void __exit veth_module_cleanup(void)
+
static
void __exit veth_module_cleanup(void)
{
int i;
struct veth_lpar_connection *cnx;
{
int i;
struct veth_lpar_connection *cnx;
@@
-1697,11
+1697,14
@@
void __exit veth_module_cleanup(void)
}
module_exit(veth_module_cleanup);
}
module_exit(veth_module_cleanup);
-int __init veth_module_init(void)
+
static
int __init veth_module_init(void)
{
int i;
int rc;
{
int i;
int rc;
+ if (!firmware_has_feature(FW_FEATURE_ISERIES))
+ return -ENODEV;
+
this_lp = HvLpConfig_getLpIndex_outline();
for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
this_lp = HvLpConfig_getLpIndex_outline();
for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {