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

Commit d8cd189e authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

mac80211: use PS Poll and Nullfunc templates when sending such frames 



To avoid duplicate code, use ieee80211_[pspoll|nullfunc]_get() to get
templates for PS Poll and Nullfunc frames in mlme.c.

Compile-tested only.

Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7044cc56

net/mac80211/mlme.c

+9 −39
Original line number Diff line number Diff line
@@ -249,30 +249,15 @@ static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, 
void ieee80211_send_pspoll(struct ieee80211_local *local,

			   struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct ieee80211_pspoll *pspoll;

	struct sk_buff *skb;

	u16 fc;



	skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*pspoll));

	if (!skb) {

		printk(KERN_DEBUG "%s: failed to allocate buffer for "

		       "pspoll frame\n", sdata->name);

	skb = ieee80211_pspoll_get(&local->hw, &sdata->vif);

	if (!skb)

		return;

	}

	skb_reserve(skb, local->hw.extra_tx_headroom);



	pspoll = (struct ieee80211_pspoll *) skb_put(skb, sizeof(*pspoll));

	memset(pspoll, 0, sizeof(*pspoll));

	fc = IEEE80211_FTYPE_CTL | IEEE80211_STYPE_PSPOLL | IEEE80211_FCTL_PM;

	pspoll->frame_control = cpu_to_le16(fc);

	pspoll->aid = cpu_to_le16(ifmgd->aid);



	/* aid in PS-Poll has its two MSBs each set to 1 */

	pspoll->aid |= cpu_to_le16(1 << 15 | 1 << 14);



	memcpy(pspoll->bssid, ifmgd->bssid, ETH_ALEN);

	memcpy(pspoll->ta, sdata->vif.addr, ETH_ALEN);

	pspoll = (struct ieee80211_pspoll *) skb->data;

	pspoll->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);



	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

	ieee80211_tx_skb(sdata, skb);
@@ -283,30 +268,15 @@ void ieee80211_send_nullfunc(struct ieee80211_local *local, 
			     int powersave)

{

	struct sk_buff *skb;

	struct ieee80211_hdr *nullfunc;

	__le16 fc;

	struct ieee80211_hdr_3addr *nullfunc;



	if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION))

	skb = ieee80211_nullfunc_get(&local->hw, &sdata->vif);

	if (!skb)

		return;



	skb = dev_alloc_skb(local->hw.extra_tx_headroom + 24);

	if (!skb) {

		printk(KERN_DEBUG "%s: failed to allocate buffer for nullfunc "

		       "frame\n", sdata->name);

		return;

	}

	skb_reserve(skb, local->hw.extra_tx_headroom);



	nullfunc = (struct ieee80211_hdr *) skb_put(skb, 24);

	memset(nullfunc, 0, 24);

	fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC |

			 IEEE80211_FCTL_TODS);

	nullfunc = (struct ieee80211_hdr_3addr *) skb->data;

	if (powersave)

		fc |= cpu_to_le16(IEEE80211_FCTL_PM);

	nullfunc->frame_control = fc;

	memcpy(nullfunc->addr1, sdata->u.mgd.bssid, ETH_ALEN);

	memcpy(nullfunc->addr2, sdata->vif.addr, ETH_ALEN);

	memcpy(nullfunc->addr3, sdata->u.mgd.bssid, ETH_ALEN);

		nullfunc->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);



	IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

	ieee80211_tx_skb(sdata, skb);