diff options
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | etc/modprobe.d/no-copybreak.conf | 3 | ||||
| -rwxr-xr-x | scripts/vyatta-interfaces.pl | 15 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.def | 9 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/local-ip/node.def | 1 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/multicast/node.def | 1 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/remote-ip/node.def | 1 |
7 files changed, 31 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 91ea2a55..8b3b2409 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +vyatta-cfg-system (0.19.52) unstable; urgency=low + + * Remove these priorities as they are not needed. They are from an + earlier community submitted patch see bug 5491 + * Bugfix 6958: only call cleanup script for tunnel modules on the last + sibling deletion + + -- John Southworth <john.southworth@vyatta.com> Mon, 28 Mar 2011 18:19:32 -0500 + +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 ] 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 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"; diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index f4d53c1a..c8670a16 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -39,8 +39,11 @@ delete: ip link set $VAR(@) down else ip tunnel del $VAR(@) mode $VAR(./encapsulation/@) fi -end: if [ ${COMMIT_ACTION} = "DELETE" ]; then - /opt/vyatta/sbin/vyatta-tunnel-cleanup - fi +end: if [ "$COMMIT_SIBLING_POSITION" = "LAST" ] || \ + [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then + if [ ${COMMIT_ACTION} = "DELETE" ]; then + /opt/vyatta/sbin/vyatta-tunnel-cleanup + fi + fi diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def index 390d2767..c60b3adc 100644 --- a/templates/interfaces/tunnel/node.tag/local-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def @@ -1,4 +1,3 @@ -priority: 385 type: ipv4 help: Local IP address for this tunnel [REQUIRED] diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def index 8f5e2ede..505b8cf8 100644 --- a/templates/interfaces/tunnel/node.tag/multicast/node.def +++ b/templates/interfaces/tunnel/node.tag/multicast/node.def @@ -1,4 +1,3 @@ -priority: 385 type: txt help: Multicast operation over tunnel default: "disable" diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def index 85ee0285..f24397b8 100644 --- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/remote-ip/node.def @@ -1,4 +1,3 @@ -priority: 385 type: ipv4 help: Remote IP address for this tunnel [REQUIRED] update: if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then |