diff --git a/xCAT-genesis-scripts/usr/bin/bmcsetup b/xCAT-genesis-scripts/usr/bin/bmcsetup
index 7625827c0..f923576e0 100755
--- a/xCAT-genesis-scripts/usr/bin/bmcsetup
+++ b/xCAT-genesis-scripts/usr/bin/bmcsetup
@@ -238,7 +238,7 @@ elif [ "$IPMIMFG" = "19046" -a "$XPROD" = "1287" ]; then
         LANCHAN=$(ipmitool raw 0x32 0x72 4 1 0|sed -e 's/^ 0//')
     fi
     ipmitool raw 0x3c 0x70 0 1 2> /dev/null
-    USBSTATE=$(ipmitool raw 0x32 0xab)
+    #USBSTATE=$(ipmitool raw 0x32 0xab)
     #ipmitool raw 0x32 0xaa 0
 elif [ "$IPMIMFG" == 20301 -o "$IPMIMFG" == 19046 -a "$XPROD" != 502 ] ; then
     IBMVPDV=`ipmitool raw 0x3a 0xb 2 0 16 1`
@@ -707,16 +707,14 @@ if [ -e /tmp/xcchostnic ]; then
     ip netns exec mgt ip link set dev $INTERFACE netns 1
     /usr/sbin/setupimmnic
 fi
-if [ ! -z "$USBSTATE" ]; then  # Continuation of SR635/SR655 specific code
-    if [ "$BMCPORT" = 0 ]; then
-        # Enable ipv6 at least for the 'other' interface
-        # this is opposite of the selected port
-        ipmitool raw 0x32 0x71 0 1 2
-    else
-        ipmitool raw 0x32 0x71 0 0 2
-    fi
+#if [ ! -z "$USBSTATE" ]; then  # Continuation of SR635/SR655 specific code
+#    if [ "$BMCPORT" = 0 ]; then
+#        # Enable ipv6 at least for the 'other' interface
+#        # this is opposite of the selected port
+#        ipmitool raw 0x32 0x71 0 1 2
+#    fi
 #    ipmitool raw 0x32 0xaa $USBSTATE
-fi
+#fi
 
 
 # remove the bmc configuration information before exit