[rhel5-branch] Include and initialize the IP over Infiniband module.

[Ales Kozumplik <akozumpl@xxxxxxxxxx>]

Related: rhbz#660684
---
 loader2/hardware.c |    5 +++++
 loader2/hardware.h |    4 ++--
 loader2/loader.c   |    1 +
 scripts/mk-images  |    3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/loader2/hardware.c b/loader2/hardware.c
index 4c6f2d3..4639ecd 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -296,6 +296,11 @@ int busProbe(moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps,
     return 0;
 }
 
+void infinibandSetup(moduleList modLoaded, moduleDeps modDeps,
+                     moduleInfoSet modInfo)
+{
+    mlLoadModule("ib_ipoib", modLoaded, modDeps, modInfo, NULL);
+}
 
 void ipv6Setup(moduleList modLoaded, moduleDeps modDeps,
                moduleInfoSet modInfo) {
diff --git a/loader2/hardware.h b/loader2/hardware.h
index 7014cf8..206d7b3 100644
--- a/loader2/hardware.h
+++ b/loader2/hardware.h
@@ -19,10 +19,10 @@ void ideSetup(moduleList modLoaded, moduleDeps modDeps,
               moduleInfoSet modInfo);
 void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
                moduleInfoSet modInfo);
-
+void infinibandSetup(moduleList modLoaded, moduleDeps modDeps,
+                     moduleInfoSet modInfo);
 void ipv6Setup(moduleList modLoaded, moduleDeps modDeps,
                moduleInfoSet modInfo);
-
 void spufsSetup(moduleList modLoaded, moduleDeps modDeps,
                moduleInfoSet modInfo);
 #endif
diff --git a/loader2/loader.c b/loader2/loader.c
index 488bb5b..9729072 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1616,6 +1616,7 @@ int main(int argc, char ** argv) {
     scsiSetup(modLoaded, modDeps, modInfo);
     dasdSetup(modLoaded, modDeps, modInfo);
     spufsSetup(modLoaded, modDeps, modInfo);
+    infinibandSetup(modLoaded, modDeps, modInfo);
 
     /* Note we *always* do this. If you could avoid this you could get
        a system w/o USB keyboard support, which would be bad. */
diff --git a/scripts/mk-images b/scripts/mk-images
index 59e3c0b..99d861c 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -49,7 +49,8 @@ SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS"
 BTERMMODS="vga16fb"
 CRYPTOMODS="sha256 xts aes_generic"
 PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia"
-INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $BTERMMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
+INFINIBANDMODS="ib_ipoib"
+INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $BTERMMODS $COMMONMODS $PCMCIASOCKMODS $INFINIBANDMODS =scsi =net"
 
 # Set, verify, and create paths
     KERNELPATH=$1
-- 
1.7.3.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list