summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/boot/nat-spec-surge-client.rcS2
-rwxr-xr-xconfigs/boot/nat-spec-surge-server.rcS2
-rw-r--r--configs/boot/spec-surge-client.rcS2
-rwxr-xr-xconfigs/boot/spec-surge-server.rcS2
-rwxr-xr-xconfigs/boot/surge-client.rcS2
-rwxr-xr-xconfigs/boot/surge-server.rcS2
-rw-r--r--dev/ns_gige.cc2
7 files changed, 8 insertions, 6 deletions
diff --git a/configs/boot/nat-spec-surge-client.rcS b/configs/boot/nat-spec-surge-client.rcS
index 39e3e5070..2c0b46607 100644
--- a/configs/boot/nat-spec-surge-client.rcS
+++ b/configs/boot/nat-spec-surge-client.rcS
@@ -6,7 +6,7 @@ CLIENT=10.0.0.2
SERVER=192.168.0.1
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/configs/boot/nat-spec-surge-server.rcS b/configs/boot/nat-spec-surge-server.rcS
index 39eb5bee0..ed0e96a44 100755
--- a/configs/boot/nat-spec-surge-server.rcS
+++ b/configs/boot/nat-spec-surge-server.rcS
@@ -5,7 +5,7 @@
NATBOX=192.168.0.7
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/configs/boot/spec-surge-client.rcS b/configs/boot/spec-surge-client.rcS
index b7a2a12e4..6ce2ce9de 100644
--- a/configs/boot/spec-surge-client.rcS
+++ b/configs/boot/spec-surge-client.rcS
@@ -4,7 +4,7 @@
#
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/configs/boot/spec-surge-server.rcS b/configs/boot/spec-surge-server.rcS
index 61afd78bf..12e31696b 100755
--- a/configs/boot/spec-surge-server.rcS
+++ b/configs/boot/spec-surge-server.rcS
@@ -4,7 +4,7 @@
#
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/configs/boot/surge-client.rcS b/configs/boot/surge-client.rcS
index f41c13882..208524a9c 100755
--- a/configs/boot/surge-client.rcS
+++ b/configs/boot/surge-client.rcS
@@ -4,7 +4,7 @@
#
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/configs/boot/surge-server.rcS b/configs/boot/surge-server.rcS
index 75642c259..3feb7b581 100755
--- a/configs/boot/surge-server.rcS
+++ b/configs/boot/surge-server.rcS
@@ -5,7 +5,7 @@
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index e51e14f1d..c650c7943 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -2166,6 +2166,7 @@ NSGigE::serialize(ostream &os)
SERIALIZE_SCALAR(rxEnable);
SERIALIZE_SCALAR(CRDD);
SERIALIZE_SCALAR(rxPktBytes);
+ SERIALIZE_SCALAR(rxFragPtr);
SERIALIZE_SCALAR(rxDescCnt);
int rxDmaState = this->rxDmaState;
SERIALIZE_SCALAR(rxDmaState);
@@ -2314,6 +2315,7 @@ NSGigE::unserialize(Checkpoint *cp, const std::string &section)
UNSERIALIZE_SCALAR(rxEnable);
UNSERIALIZE_SCALAR(CRDD);
UNSERIALIZE_SCALAR(rxPktBytes);
+ UNSERIALIZE_SCALAR(rxFragPtr);
UNSERIALIZE_SCALAR(rxDescCnt);
int rxDmaState;
UNSERIALIZE_SCALAR(rxDmaState);