Revert "mac80211: fix rates setup on IBSS merge"

I accidentally merged an incomplete version of the patch...

This reverts commit b4d59a93.

Signed-off-by: John W. Linville <linville@tuxdriver.com>