NDIS-WDM has to be KMDF for Vista WHQL?


I have an existing NDIS-WDM miniport driver on Windows XP, and I want it run
on Windows Vista and also get WHQL certified with Windows logo. The driver
has NDIS 5.0 miniport interface at its upper edge, and communicates to USB WDM at
its lower edge. There is a USB interface between the hardware device and
Windows host PC.
My question is do I have to port this driver to KMDF (kernel mode driver
framework) on Vista in order to get WHQL certified for Windows logo? Or, does
WHQL on Vista allow me to keep the current NDIS-WDM architecture, and make it
work on Vista without porting to KMDF?

Thanks in advance for any feedback.