net/packet: merge fix