--- openibd	2009-02-04 14:03:31.000000000 -0800
+++ openibd.new	2009-02-04 14:03:37.000000000 -0800
@@ -295,7 +295,7 @@ fi    
 
 GEN1_UNLOAD_MODULES="ib_srp_target scsi_target ib_srp kdapltest_module ib_kdapl ib_sdp ib_useraccess ib_useraccess_cm ib_cm ib_dapl_srv ib_ip2pr ib_ipoib ib_tavor mod_thh mod_rhh ib_dm_client ib_sa_client ib_client_query ib_poll ib_mad ib_core ib_services"
 
-UNLOAD_MODULES="ib_mthca mlx4_ib ib_ipath ipath_core ib_ehca iw_cxgb3 cxgb3"
+UNLOAD_MODULES="ib_mthca mlx4_ib ib_ipath ipath_core ib_ehca iw_nes iw_cxgb3 cxgb3"
 UNLOAD_MODULES="$UNLOAD_MODULES ib_ipoib ib_madeye ib_rds"
 UNLOAD_MODULES="$UNLOAD_MODULES rds ib_ucm kdapl ib_srp_target scsi_target ib_srpt ib_srp ib_iser ib_sdp"
 UNLOAD_MODULES="$UNLOAD_MODULES rdma_ucm rdma_cm ib_addr ib_cm ib_local_sa findex"
@@ -866,6 +866,17 @@ start()
         RC=$[ $RC + $my_rc ]
     fi
 
+    # Load iw_nes driver
+    if [ "X${NES_LOAD}" == "Xyes" ]; then
+        fix_location_codes
+        /sbin/modprobe iw_nes > /dev/null 2>&1
+        my_rc=$?
+        if [ $my_rc -ne 0 ]; then
+                echo_failure $"Loading nes driver: "
+        fi
+        RC=$[ $RC + $my_rc ]
+    fi
+
 cat << EOF >> /tmp/ib_set_node_desc.sh
 #!/bin/bash
 #
@@ -1138,7 +1149,7 @@ unload()
 				/sbin/modprobe -v -r $mod > /dev/null 2>&1
 				sleep 2
 			;;
-			ib_mthca | mlx4_ib | ib_ehca | iw_cxgb3)
+			ib_mthca | mlx4_ib | ib_ehca | iw_cxgb3 |iw_nes)
                                 rm_mod $mod
 				sleep 2
 			;;
@@ -1357,7 +1368,7 @@ status()
 {
     local RC=0
  
-       if is_module ib_mthca || is_module mlx4_core || is_module ib_ipath || is_module ib_ehca || is_module iw_cxgb3; then
+       if is_module ib_mthca || is_module mlx4_core || is_module ib_ipath || is_module ib_ehca || is_module iw_cxgb3 || is_module iw_nes; then
                echo
                echo "  HCA driver loaded"
                echo