From 83e28f37c7b89b3502e97e719fc6ff3bcec6594f Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 22 Mar 2011 15:53:23 -0700
Subject: Update copybreak module param list

Update list of network drivers copybreak parameters to match current
kernel version.  This is harmless with out of date kernels.
Fixes warning about unknown module parameter with r8169
---
 etc/modprobe.d/no-copybreak.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/modprobe.d/no-copybreak.conf b/etc/modprobe.d/no-copybreak.conf
index 967be532..822fcf30 100644
--- a/etc/modprobe.d/no-copybreak.conf
+++ b/etc/modprobe.d/no-copybreak.conf
@@ -40,6 +40,7 @@
 
 options 3c515 rx_copybreak=0
 options 3c59x rx_copybreak=0
+options bcm63xx copybreak=0
 options cxgb copybreak=0
 options e1000 copybreak=0
 options e1000e copybreak=0
@@ -48,8 +49,8 @@ options fealnx rx_copybreak=0
 options hamachi rx_copybreak=0
 options ixgb copybreak=0
 options natsemi rx_copybreak=0
+options pch_gbe copybreak=0
 options pcnet32 rx_copybreak=0
-options r8169 rx_copybreak=0
 options sis190 rx_copybreak=0
 options sky2 copybreak=0
 options starfire rx_copybreak=0
-- 
cgit v1.2.3


From dd7f6937e0cbe4f4705f4dde9a333852ba21f7c9 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 25 Mar 2011 15:28:51 -0700
Subject: Fix use of uninitialized ospeed

If speed can not be determined then ospeed is undef.
---
 scripts/vyatta-interfaces.pl | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index c2ec9a44..30b35c05 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -452,14 +452,13 @@ sub set_speed_duplex {
 
     # read old values to avoid meaningless speed changes
     my ($autoneg, $ospeed, $oduplex) = get_ethtool($intf);
-    if (defined($autoneg)) {
-	if ($autoneg == 1) {
-	    # Device is already in autonegotiation mode
-	    return if ($nspeed eq 'auto');
-	} else {
-	    # Device has explicit speed/duplex but they already match
-	    return if (($nspeed eq $ospeed) && ($nduplex eq $oduplex));
-	}
+
+    if (defined($autoneg) && $autoneg == 1) {
+	# Device is already in autonegotiation mode
+	return if ($nspeed eq 'auto');
+    } elsif (defined($ospeed) && defined($oduplex)) {
+	# Device has explicit speed/duplex but they already match
+	return if (($nspeed eq $ospeed) && ($nduplex eq $oduplex));
     }
 
     my $cmd = "$ETHTOOL -s $intf";
-- 
cgit v1.2.3


From 1fb6a13244dfd04f121cc7625c199cf963572b97 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 25 Mar 2011 15:40:06 -0700
Subject: 0.19.51

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 91ea2a55..ec0b2080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-system (0.19.51) unstable; urgency=low
+
+  * Update copybreak module param list
+  * Fix use of uninitialized ospeed
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Fri, 25 Mar 2011 15:40:06 -0700
+
 vyatta-cfg-system (0.19.50) unstable; urgency=low
 
   [ Stephen Hemminger ]
-- 
cgit v1.2.3