Revert "mac80211: remove struct ieee80211_if_init_conf"

This reverts commit 91c11b43762ecd4df93be41e11c4cee491dabd55.
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-debug.h
	drivers/net/wireless/iwlwifi/iwl-debugfs.c
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-devtrace.c
	drivers/net/wireless/iwlwifi/iwl-devtrace.h
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/libertas/Makefile
	drivers/net/wireless/libertas/assoc.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/libertas/cmd.h
	drivers/net/wireless/libertas/dev.h
	drivers/net/wireless/libertas/ethtool.c
	drivers/net/wireless/libertas/main.c
	drivers/net/wireless/libertas/mesh.c
	drivers/net/wireless/libertas/mesh.h
	drivers/net/wireless/libertas/scan.c
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2800usb.h
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h
	drivers/net/wireless/wl12xx/wl1251_acx.c
	drivers/net/wireless/wl12xx/wl1251_acx.h
	include/net/mac80211.h
	net/mac80211/agg-rx.c
	net/mac80211/agg-tx.c
	net/mac80211/debugfs_netdev.c
	net/mac80211/debugfs_sta.c
	net/mac80211/driver-ops.h
	net/mac80211/driver-trace.h
	net/mac80211/iface.c
	net/mac80211/mesh_hwmp.c
	net/mac80211/rx.c
	net/mac80211/sta_info.c
	net/mac80211/status.c
	net/mac80211/tkip.c
	net/mac80211/tx.c
	net/wireless/Kconfig
	net/wireless/Makefile
	net/wireless/mlme.c