Commit 15d96753 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

mac80211: Add antenna configuration 



Allow antenna configuration by calling driver's function for it.

We disallow antenna configuration if the wiphy is already running, mainly to
make life easier for 802.11n drivers which need to recalculate HT capabilites.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent afe0cbf8

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1799,6 +1799,8 @@ struct ieee80211_ops { 
	void (*channel_switch)(struct ieee80211_hw *hw,

			       struct ieee80211_channel_switch *ch_switch);

	int (*napi_poll)(struct ieee80211_hw *hw, int budget);

	int (*set_antenna)(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant);

	int (*get_antenna)(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);

};



/**

net/mac80211/cfg.c

+19 −0
Original line number Diff line number Diff line
@@ -1628,6 +1628,23 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, 
	ieee80211_queue_work(&local->hw, &local->reconfig_filter);

}



static int ieee80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);



	if (local->started)

		return -EOPNOTSUPP;



	return drv_set_antenna(local, tx_ant, rx_ant);

}



static int ieee80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);



	return drv_get_antenna(local, tx_ant, rx_ant);

}



struct cfg80211_ops mac80211_config_ops = {

	.add_virtual_intf = ieee80211_add_iface,

	.del_virtual_intf = ieee80211_del_iface,
@@ -1680,4 +1697,6 @@ struct cfg80211_ops mac80211_config_ops = { 
	.mgmt_tx = ieee80211_mgmt_tx,

	.set_cqm_rssi_config = ieee80211_set_cqm_rssi_config,

	.mgmt_frame_register = ieee80211_mgmt_frame_register,

	.set_antenna = ieee80211_set_antenna,

	.get_antenna = ieee80211_get_antenna,

};

net/mac80211/driver-ops.h

+23 −0
Original line number Diff line number Diff line
@@ -442,4 +442,27 @@ static inline void drv_channel_switch(struct ieee80211_local *local, 
	trace_drv_return_void(local);

}





static inline int drv_set_antenna(struct ieee80211_local *local,

				  u32 tx_ant, u32 rx_ant)

{

	int ret = -EOPNOTSUPP;

	might_sleep();

	if (local->ops->set_antenna)

		ret = local->ops->set_antenna(&local->hw, tx_ant, rx_ant);

	trace_drv_set_antenna(local, tx_ant, rx_ant, ret);

	return ret;

}



static inline int drv_get_antenna(struct ieee80211_local *local,

				  u32 *tx_ant, u32 *rx_ant)

{

	int ret = -EOPNOTSUPP;

	might_sleep();

	if (local->ops->get_antenna)

		ret = local->ops->get_antenna(&local->hw, tx_ant, rx_ant);

	trace_drv_get_antenna(local, *tx_ant, *rx_ant, ret);

	return ret;

}



#endif /* __MAC80211_DRIVER_OPS */

net/mac80211/driver-trace.h

+50 −0
Original line number Diff line number Diff line
@@ -883,6 +883,56 @@ TRACE_EVENT(drv_channel_switch, 
	)

);



TRACE_EVENT(drv_set_antenna,

	TP_PROTO(struct ieee80211_local *local, u32 tx_ant, u32 rx_ant, int ret),



	TP_ARGS(local, tx_ant, rx_ant, ret),



	TP_STRUCT__entry(

		LOCAL_ENTRY

		__field(u32, tx_ant)

		__field(u32, rx_ant)

		__field(int, ret)

	),



	TP_fast_assign(

		LOCAL_ASSIGN;

		__entry->tx_ant = tx_ant;

		__entry->rx_ant = rx_ant;

		__entry->ret = ret;

	),



	TP_printk(

		LOCAL_PR_FMT " tx_ant:%d rx_ant:%d ret:%d",

		LOCAL_PR_ARG, __entry->tx_ant, __entry->rx_ant, __entry->ret

	)

);



TRACE_EVENT(drv_get_antenna,

	TP_PROTO(struct ieee80211_local *local, u32 tx_ant, u32 rx_ant, int ret),



	TP_ARGS(local, tx_ant, rx_ant, ret),



	TP_STRUCT__entry(

		LOCAL_ENTRY

		__field(u32, tx_ant)

		__field(u32, rx_ant)

		__field(int, ret)

	),



	TP_fast_assign(

		LOCAL_ASSIGN;

		__entry->tx_ant = tx_ant;

		__entry->rx_ant = rx_ant;

		__entry->ret = ret;

	),



	TP_printk(

		LOCAL_PR_FMT " tx_ant:%d rx_ant:%d ret:%d",

		LOCAL_PR_ARG, __entry->tx_ant, __entry->rx_ant, __entry->ret

	)

);



/*

 * Tracing for API calls that drivers call.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE