Merge tag 'upstream/1.4' into debian-experimental

* tag 'upstream/1.4':
  Imported Upstream version 1.4

1 files changed, 24 insertions, 0 deletions

diff --git a/src/syscall/route_freebsd_32bit.go b/src/syscall/route_freebsd_32bit.go
new file mode 100644
index 000000000..93efdddb3
--- /dev/null
+++ b/src/syscall/route_freebsd_32bit.go
@@ -0,0 +1,24 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build freebsd,386 freebsd,arm
+
+package syscall
+
+import "unsafe"
+
+func (any *anyMessage) parseInterfaceMessage(b []byte) *InterfaceMessage {
+	p := (*InterfaceMessage)(unsafe.Pointer(any))
+	// FreeBSD 10 and beyond have a restructured mbuf
+	// packet header view.
+	// See http://svnweb.freebsd.org/base?view=revision&revision=254804.
+	if freebsdVersion >= 1000000 {
+		m := (*ifMsghdr)(unsafe.Pointer(any))
+		p.Header.Data.Hwassist = uint32(m.Data.Hwassist)
+		p.Header.Data.Epoch = m.Data.Epoch
+		p.Header.Data.Lastchange = m.Data.Lastchange
+		return &InterfaceMessage{Header: p.Header, Data: b[sizeofIfMsghdr:any.Msglen]}
+	}
+	return &InterfaceMessage{Header: p.Header, Data: b[SizeofIfMsghdr:any.Msglen]}
+}