Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9af221b3 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: announce P2P_DEVICE support in wiphy structure 



P2P_DEVICE support was removed from brcmfmac for v3.9 kernel with
the commit below:

commit 1527c343
Author: Arend van Spriel <arend@broadcom.com>
Date:   Thu Apr 4 12:10:11 2013 +0200

    brcmfmac: remove advertising P2P device support

However, it got merged into wireless-next. But for 3.10 brcmfmac does
support P2P device. Putting it back with this commit.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 58dd3ff8

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+6 −1
Original line number Diff line number Diff line
@@ -4140,6 +4140,10 @@ static const struct ieee80211_iface_limit brcmf_iface_limits[] = { 
		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |

			 BIT(NL80211_IFTYPE_P2P_GO)

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_DEVICE)

	}

};

static const struct ieee80211_iface_combination brcmf_iface_combos[] = {

	{
@@ -4197,7 +4201,8 @@ static struct wiphy *brcmf_setup_wiphy(struct device *phydev) 
				 BIT(NL80211_IFTYPE_ADHOC) |

				 BIT(NL80211_IFTYPE_AP) |

				 BIT(NL80211_IFTYPE_P2P_CLIENT) |

				 BIT(NL80211_IFTYPE_P2P_GO);

				 BIT(NL80211_IFTYPE_P2P_GO) |

				 BIT(NL80211_IFTYPE_P2P_DEVICE);

	wiphy->iface_combinations = brcmf_iface_combos;

	wiphy->n_iface_combinations = ARRAY_SIZE(brcmf_iface_combos);

	wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;