> +void viport_disconnect(struct viport *viport)
 > +{
 > +	VIPORT_FUNCTION("viport_disconnect()\n");
 > +	viport->disconnect = 1;
 > +	viport_failure(viport);
 > +	wait_event(viport->disconnect_queue, viport->disconnect == 0);
 > +}
 > +
 > +void viport_free(struct viport *viport)
 > +{
 > +	VIPORT_FUNCTION("viport_free()\n");
 > +	viport_disconnect(viport);	/* NOTE: this can sleep */

There are no other calls to viport_disconnect() that I can see, so it
can be made static (and the declaration in vnic_viport.h can be dropped).
in fact given how small the function is and the fact that it has only a
single call site, it might be easier just to merge it into
viport_free().  But that's a matter of taste.

 - R.