Commit da93c26d authored Jul 27, 2012 by Javier Lopez Committed by John W. Linville Aug 06, 2012

carl9170: Add support for NL80211_IFTYPE_MESH_POINT interfaces



This patch contains following modifications:

- Add mesh capabilities on fw.c to permit creation of mesh
  interfaces using this driver.

- Modify carl9170_set_operating_mode, to use AP-style beaconing
  with mesh interfaces.

- Allow beacon updates for NL80211_IFTYPE_MESH_POINT type in
  carl9170_handle_command_response.

- Add NL80211_IFTYPE_MESH_POINT case on carl9170_op_add_interfaces to
  support mesh/ap/sta virtual interface combinations.

Signed-off-by: Javier Lopez <jlopex@cozybit.com>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent c071b9f6

drivers/net/wireless/ath/carl9170/fw.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -341,6 +341,7 @@ static int carl9170_fw(struct ar9170 ar, const __u8 data, size_t len)
		if (SUPP(CARL9170FW_WLANTX_CAB)) {
		if_comb_types \|=
		BIT(NL80211_IFTYPE_AP) \|
		BIT(NL80211_IFTYPE_MESH_POINT) \|
		BIT(NL80211_IFTYPE_P2P_GO);
		}
		}

drivers/net/wireless/ath/carl9170/mac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -318,10 +318,10 @@ int carl9170_set_operating_mode(struct ar9170 *ar)
		bssid = common->curbssid;

		switch (vif->type) {
		case NL80211_IFTYPE_MESH_POINT:
		case NL80211_IFTYPE_ADHOC:
		cam_mode \|= AR9170_MAC_CAM_IBSS;
		break;
		case NL80211_IFTYPE_MESH_POINT:
		case NL80211_IFTYPE_AP:
		cam_mode \|= AR9170_MAC_CAM_AP;

drivers/net/wireless/ath/carl9170/main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -616,10 +616,12 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw,

		goto unlock;

		case NL80211_IFTYPE_MESH_POINT:
		case NL80211_IFTYPE_AP:
		if ((vif->type == NL80211_IFTYPE_STATION) \|\|
		(vif->type == NL80211_IFTYPE_WDS) \|\|
		(vif->type == NL80211_IFTYPE_AP))
		(vif->type == NL80211_IFTYPE_AP) \|\|
		(vif->type == NL80211_IFTYPE_MESH_POINT))
		break;

		err = -EBUSY;

drivers/net/wireless/ath/carl9170/rx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,7 @@ void carl9170_handle_command_response(struct ar9170 ar, void buf, u32 len)

		case NL80211_IFTYPE_AP:
		case NL80211_IFTYPE_ADHOC:
		case NL80211_IFTYPE_MESH_POINT:
		carl9170_update_beacon(ar, true);
		break;