treewide: unfork netlink
We were using our own fork because of the psample change whose
upstreaming effort has stalled since Mateusz left the company. That
netlink base is now getting too old and we have more patches on top
which all have since become irrelevant or got upstreamed.
The new version of netlink also no longer has the quirk that default
routes do not have a destination set, fix that in the DHCP tests and use
go-cmp as the raw binary values are annoying to get right and do not
matter. Semantic equivalence is what we're after.
Thus stop using our fork and instead pick up the rebased psample patches
from the new upstreaming effort. This removes one more replace directive
which is nice.
Change-Id: I21a59c2c9a99dd3baf672a8aa2ad9332e573cba1
Reviewed-on: https://review.monogon.dev/c/monogon/+/3750
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/osbase/net/dump/netdump.go b/osbase/net/dump/netdump.go
index a7d8023..c3bf9f7 100644
--- a/osbase/net/dump/netdump.go
+++ b/osbase/net/dump/netdump.go
@@ -61,7 +61,7 @@
var iface netapi.Interface
switch l := link.(type) {
case *netlink.Device:
- mac := link.Attrs().PermHardwareAddr
+ mac := link.Attrs().PermHWAddr
if len(mac) == 0 {
// Try legacy method for old kernels
mac, err = getPermanentHWAddrLegacy(l.Name)