Is it possible to undo the ixgbe device name change?

[David Howells <dhowells@redhat.com>]

[resent with mailing list addresses fixes]

Hi,

With commit:

	a0285236ab93fdfdd1008afaa04561d142d6c276
	ixgbe: add initial devlink support

the name of the device that I see on my 10G ethernet card changes from enp1s0
to enp1s0np0.

This is a bit of a problem for my test box because I have Network Manager set
up static configuration for that enp1s0... which no longer exists when that
commit is applied.  I could change to enp1s0np0, but then this would no longer
exist if I want to test a kernel that doesn't have that commit applied.

If the name doesn't exist, booting pauses for about a minute while NM tries to
find it (probably a NM bug), so adding both names isn't an option either :-/

(I don't use DHCP for this adapter as it's directly wired to another test box)

Alternatively, as a compromise, might it be possible to omit the "np0" bit if
the adapter only has one port?

Thanks,
David