There is no software unlock for 2.2.1, so the answer is neither.
2.2.1 comes with baseband 2.30 for which there isn't an unlock. You might be able to downgrade to 2.28 if you're lucky - search for forum for threads about downgrading 2.30 to 2.28, but you'll only be able to do that if you have bootloader v5.8