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

Commit 6e0bd6c3 authored by Rostislav Lisovy's avatar Rostislav Lisovy Committed by Johannes Berg
Browse files

cfg80211: 802.11p OCB mode handling 



This patch adds new iface type (NL80211_IFTYPE_OCB) representing
the OCB (Outside the Context of a BSS) mode.
When establishing a connection to the network a cfg80211_join_ocb
function is called (particular nl80211_command is added as well).
A mandatory parameters during the ocb_join operation are 'center
frequency' and 'channel width (5/10 MHz)'.

Changes done in mac80211 are minimal possible required to avoid
many warnings (warning: enumeration value 'NL80211_IFTYPE_OCB'
not handled in switch) during compilation. Full functionality
(where needed) is added in the following patch.

Signed-off-by: default avatarRostislav Lisovy <rostislav.lisovy@fel.cvut.cz>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5b3dc42b

include/net/cfg80211.h

+19 −0
Original line number Diff line number Diff line
@@ -1358,6 +1358,16 @@ struct mesh_setup { 
	u32 basic_rates;

};



/**

 * struct ocb_setup - 802.11p OCB mode setup configuration

 * @chandef: defines the channel to use

 *

 * These parameters are fixed when connecting to the network

 */

struct ocb_setup {

	struct cfg80211_chan_def chandef;

};



/**

 * struct ieee80211_txq_params - TX queue parameters

 * @ac: AC identifier
@@ -2352,6 +2362,11 @@ struct cfg80211_qos_map { 
 *	with the peer followed by immediate teardown when the addition is later

 *	rejected)

 * @del_tx_ts: remove an existing TX TS

 *

 * @join_ocb: join the OCB network with the specified parameters

 *	(invoked with the wireless_dev mutex held)

 * @leave_ocb: leave the current OCB network

 *	(invoked with the wireless_dev mutex held)

 */

struct cfg80211_ops {

	int	(*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -2433,6 +2448,10 @@ struct cfg80211_ops { 
			     const struct mesh_setup *setup);

	int	(*leave_mesh)(struct wiphy *wiphy, struct net_device *dev);



	int	(*join_ocb)(struct wiphy *wiphy, struct net_device *dev,

			    struct ocb_setup *setup);

	int	(*leave_ocb)(struct wiphy *wiphy, struct net_device *dev);



	int	(*change_bss)(struct wiphy *wiphy, struct net_device *dev,

			      struct bss_parameters *params);

include/uapi/linux/nl80211.h

+11 −0
Original line number Diff line number Diff line
@@ -746,6 +746,11 @@ 
 *	destination %NL80211_ATTR_MAC on the interface identified by

 *	%NL80211_ATTR_IFINDEX.

 *

 * @NL80211_CMD_JOIN_OCB: Join the OCB network. The center frequency and

 *	bandwidth of a channel must be given.

 * @NL80211_CMD_LEAVE_OCB: Leave the OCB network -- no special arguments, the

 *	network is determined by the network interface.

 *

 * @NL80211_CMD_MAX: highest used command number

 * @__NL80211_CMD_AFTER_LAST: internal use

 */
@@ -922,6 +927,9 @@ enum nl80211_commands { 


	NL80211_CMD_GET_MPP,



	NL80211_CMD_JOIN_OCB,

	NL80211_CMD_LEAVE_OCB,



	/* add new commands above here */



	/* used to define NL80211_CMD_MAX below */
@@ -2074,6 +2082,8 @@ enum nl80211_attrs { 
 *	and therefore can't be created in the normal ways, use the

 *	%NL80211_CMD_START_P2P_DEVICE and %NL80211_CMD_STOP_P2P_DEVICE

 *	commands to create and destroy one

 * @NL80211_IF_TYPE_OCB: Outside Context of a BSS

 *	This mode corresponds to the MIB variable dot11OCBActivated=true

 * @NL80211_IFTYPE_MAX: highest interface type number currently defined

 * @NUM_NL80211_IFTYPES: number of defined interface types

 *
@@ -2093,6 +2103,7 @@ enum nl80211_iftype { 
	NL80211_IFTYPE_P2P_CLIENT,

	NL80211_IFTYPE_P2P_GO,

	NL80211_IFTYPE_P2P_DEVICE,

	NL80211_IFTYPE_OCB,



	/* keep last */

	NUM_NL80211_IFTYPES,

net/mac80211/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	case NUM_NL80211_IFTYPES:

	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_P2P_GO:

	case NL80211_IFTYPE_OCB:

		/* shouldn't happen */

		WARN_ON_ONCE(1);

		break;

net/mac80211/chan.c

+2 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local, 
		case NL80211_IFTYPE_ADHOC:

		case NL80211_IFTYPE_WDS:

		case NL80211_IFTYPE_MESH_POINT:

		case NL80211_IFTYPE_OCB:

			width = vif->bss_conf.chandef.width;

			break;

		case NL80211_IFTYPE_UNSPECIFIED:
@@ -909,6 +910,7 @@ ieee80211_vif_chanctx_reservation_complete(struct ieee80211_sub_if_data *sdata) 
	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_OCB:

		ieee80211_queue_work(&sdata->local->hw,

				     &sdata->csa_finalize_work);

		break;

net/mac80211/iface.c

+5 −0
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_P2P_DEVICE:

	case NL80211_IFTYPE_OCB:

		/* no special treatment */

		break;

	case NL80211_IFTYPE_UNSPECIFIED:
@@ -631,6 +632,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
		case NL80211_IFTYPE_ADHOC:

		case NL80211_IFTYPE_AP:

		case NL80211_IFTYPE_MESH_POINT:

		case NL80211_IFTYPE_OCB:

			netif_carrier_off(dev);

			break;

		case NL80211_IFTYPE_WDS:
@@ -1351,6 +1353,9 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 
		sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;

		ieee80211_sta_setup_sdata(sdata);

		break;

	case NL80211_IFTYPE_OCB:

		/* to be implemented in the future */

		break;

	case NL80211_IFTYPE_ADHOC:

		sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;

		ieee80211_ibss_setup_sdata(sdata);