summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2007-04-29 16:50:46 +0000
committerPaul Jakma <paul.jakma@sun.com>2007-04-29 16:50:46 +0000
commitbd9da7fe8cdbc915f3b43a0632326401f28fe310 (patch)
treed7c7c0993c123f2d28ba2ba4cf891faef428b115
parentbcdda30bae1fef67d998211c54c06270ba42864c (diff)
[zebra] Fix merge error in previous solaris changeset
2007-04-29 Paul Jakma <paul.jakma@sun.com> * ioctl{_solaris,}.c: (if_get_mtu) Fix missing ; in last commit.
-rw-r--r--zebra/ChangeLog4
-rw-r--r--zebra/ioctl_solaris.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index c00ede3c..19a76246 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-29 Paul Jakma <paul.jakma@sun.com>
+
+ * ioctl{_solaris,}.c: (if_get_mtu) Fix missing ; in last commit.
+
2007-04-10 Paul Jakma <paul.jakma@sun.com>
* ioctl{_solaris,}.c: (if_get_mtu) Ping clients via
diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c
index f68ea56e..6e25d876 100644
--- a/zebra/ioctl_solaris.c
+++ b/zebra/ioctl_solaris.c
@@ -195,7 +195,7 @@ if_get_mtu (struct interface *ifp)
else
{
ifp->mtu6 = lifreq.lifr_metric;
- changed = 1
+ changed = 1;
}
if (changed)