]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Revert "iwlwifi: mvm: remove P2P_DEVICE support"
authorJohannes Berg <johannes.berg@intel.com>
Fri, 31 May 2013 08:17:19 +0000 (10:17 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 31 May 2013 08:22:34 +0000 (10:22 +0200)
commit3c15a0fb61e743bc72e2d7e01e968f0247a8be8b
treef9a05da52ad9ba672ac8c20a045405c0cbba8fa7
parentf4d57941bf89997bad3294f94987caebf2771a33
Revert "iwlwifi: mvm: remove P2P_DEVICE support"

This reverts commit eebfc9394ee31b3ef162692c0cd483c1318a4395.

This wasn't intended to be included here, my mistake. I
accidentally merged a mac80211 fixes tree here that had
this change, when it wasn't even intended to be there.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/iwlwifi/mvm/mac80211.c