From 694826938f19a97640a7b87a73e5e06eb572e63c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 27 Aug 2009 09:05:48 -0700
Subject: add no copybreak for more drivers

---
 etc/modprobe.d/vyatta_nocopybreak | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'etc')

diff --git a/etc/modprobe.d/vyatta_nocopybreak b/etc/modprobe.d/vyatta_nocopybreak
index deb962f..0ac3052 100644
--- a/etc/modprobe.d/vyatta_nocopybreak
+++ b/etc/modprobe.d/vyatta_nocopybreak
@@ -40,6 +40,9 @@
 
 options e1000 copybreak=0
 options e1000e copybreak=0
+options sky2 copybreak=0
 
+options via-rhine rx_copybreak=0
+options via-velocity rx_copybreak=0
 
 
-- 
cgit v1.2.3


From 90ae175f1e0f126d93db1f9c29a3f44d76087e8d Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Fri, 28 Aug 2009 15:38:56 -0700
Subject: Bugfix 4793: Load the acpi_cpufreq module on certain processors.
 (cherry picked from commit 6202e7c5f0e8e0657c49e9d8422b6ef45b9ff84b)

---
 etc/init.d/vyatta-ofr | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 4fb4c1e..39e9904 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -125,7 +125,20 @@ cleanup_raid()
     rmmod $MD_MODULES > /tmp/vyatta_raid_cleanup_log 2>&1
 }
 
-
+#
+# Load the acpi_cpufreq kernel module, but only for certain processors.
+# Some Intel CPUs need to have it loaded in order to initialize 
+# properly.
+#
+load_acpi_cpufreq()
+{
+    manuf=`dmidecode -s processor-manufacturer`
+    family=`dmidecode -s processor-family`
+    if [ "$manuf" = "Intel" -a "$family" = "Xeon" ]; then
+	logger -t "$progname" -p user.notice "loading acpi_cpufreq module"
+	modprobe acpi_cpufreq
+    fi
+}
 
 start ()
 {
@@ -141,6 +154,7 @@ start ()
 	${vyatta_sbindir}/${s}.init start || (log_end_msg $? && return)
     done
     load_bootfile
+    load_acpi_cpufreq
     cleanup_raid
     chmod g-w,o-w /
 
-- 
cgit v1.2.3


From 1717a06d1dbc481b1894b90fd2734aeee9c1f963 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Fri, 28 Aug 2009 17:47:46 -0700
Subject: Bugfix 4793: Narrow the set of platforms on which module is loaded.
 (cherry picked from commit 97cd67eda018db24517ad644d2ad1547fdb52231)

---
 etc/init.d/vyatta-ofr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 39e9904..45333ac 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -132,9 +132,9 @@ cleanup_raid()
 #
 load_acpi_cpufreq()
 {
-    manuf=`dmidecode -s processor-manufacturer`
-    family=`dmidecode -s processor-family`
-    if [ "$manuf" = "Intel" -a "$family" = "Xeon" ]; then
+    manuf=`dmidecode -s system-manufacturer`
+    prod=`dmidecode -s system-product-name`
+    if [ "$manuf" = "Vyatta" -a "$prod" = "Series 2500" ]; then
 	logger -t "$progname" -p user.notice "loading acpi_cpufreq module"
 	modprobe acpi_cpufreq
     fi
-- 
cgit v1.2.3