Commit 7528ec57 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: add function to create data frame template including key 



For some TDLS channel switch implementations data frames need to be
sent by the firmware based on a template. This template should be
created by mac80211, and thus needs to properly be built from an
802.3 frame into an 802.11 frame. In addition, the device will need
the key information so the select_key handler needs to be run.
However, the driver/device will be responsible for all of the crypto
encapsulation, as the sequence numbers etc. cannot be built by the
host anyway in this case since it's a template to be used multiple
times.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4c9451ed

net/mac80211/ieee80211_i.h

+3 −0
Original line number Diff line number Diff line
@@ -1634,6 +1634,9 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, 
				  u32 info_flags);

void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,

			      struct sk_buff_head *skbs);

struct sk_buff *

ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata,

			      struct sk_buff *skb, u32 info_flags);



/* HT */

void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,

net/mac80211/tx.c

+31 −0
Original line number Diff line number Diff line
@@ -2277,6 +2277,37 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



struct sk_buff *

ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata,

			      struct sk_buff *skb, u32 info_flags)

{

	struct ieee80211_hdr *hdr;

	struct ieee80211_tx_data tx = {

		.local = sdata->local,

		.sdata = sdata,

	};



	rcu_read_lock();



	skb = ieee80211_build_hdr(sdata, skb, info_flags);

	if (IS_ERR(skb))

		goto out;



	hdr = (void *)skb->data;

	tx.sta = sta_info_get(sdata, hdr->addr1);

	tx.skb = skb;



	if (ieee80211_tx_h_select_key(&tx) != TX_CONTINUE) {

		rcu_read_unlock();

		kfree_skb(skb);

		return ERR_PTR(-EINVAL);

	}



out:

	rcu_read_unlock();

	return skb;

}



/*

 * ieee80211_clear_tx_pending may not be called in a context where

 * it is possible that it packets could come in again.

CRA Git | Maintained and supported by SUSTech CRA and CCSE