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

Commit c60c9929 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_common: remove ath9k_cmn_padpos 



It is equivalent to ieee80211_hdrlen

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a043dfb9

drivers/net/wireless/ath/ath9k/common.c

+0 −14
Original line number Diff line number Diff line
@@ -27,20 +27,6 @@ MODULE_AUTHOR("Atheros Communications"); 
MODULE_DESCRIPTION("Shared library for Atheros wireless 802.11n LAN cards.");

MODULE_LICENSE("Dual BSD/GPL");



int ath9k_cmn_padpos(__le16 frame_control)

{

	int padpos = 24;

	if (ieee80211_has_a4(frame_control)) {

		padpos += ETH_ALEN;

	}

	if (ieee80211_is_data_qos(frame_control)) {

		padpos += IEEE80211_QOS_CTL_LEN;

	}



	return padpos;

}

EXPORT_SYMBOL(ath9k_cmn_padpos);



int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb)

{

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

drivers/net/wireless/ath/ath9k/common.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#define ATH_EP_RND(x, mul) 						\

	(((x) + ((mul)/2)) / (mul))



int ath9k_cmn_padpos(__le16 frame_control);

int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);

void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,

			       struct ieee80211_channel *chan,

drivers/net/wireless/ath/ath9k/htc_drv_beacon.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static void ath9k_htc_send_buffered(struct ath9k_htc_priv *priv, 
	while(skb) {

		hdr = (struct ieee80211_hdr *) skb->data;



		padpos = ath9k_cmn_padpos(hdr->frame_control);

		padpos = ieee80211_hdrlen(hdr->frame_control);

		padsize = padpos & 3;

		if (padsize && skb->len > padpos) {

			if (skb_headroom(skb) < padsize) {

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ static void ath9k_htc_tx(struct ieee80211_hw *hw, 
	hdr = (struct ieee80211_hdr *) skb->data;



	/* Add the padding after the header if this is not already done */

	padpos = ath9k_cmn_padpos(hdr->frame_control);

	padpos = ieee80211_hdrlen(hdr->frame_control);

	padsize = padpos & 3;

	if (padsize && skb->len > padpos) {

		if (skb_headroom(skb) < padsize) {

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c

+4 −6
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, 
	struct sk_buff *skb = rxbuf->skb;

	struct ath_common *common = ath9k_hw_common(priv->ah);

	struct ath_htc_rx_status *rxstatus;

	int hdrlen, padpos, padsize;

	int hdrlen, padsize;

	int last_rssi = ATH_RSSI_DUMMY_MARKER;

	__le16 fc;
@@ -996,11 +996,9 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, 
	fc = hdr->frame_control;

	hdrlen = ieee80211_get_hdrlen_from_skb(skb);



	padpos = ath9k_cmn_padpos(fc);



	padsize = padpos & 3;

	if (padsize && skb->len >= padpos+padsize+FCS_LEN) {

		memmove(skb->data + padsize, skb->data, padpos);

	padsize = hdrlen & 3;

	if (padsize && skb->len >= hdrlen+padsize+FCS_LEN) {

		memmove(skb->data + padsize, skb->data, hdrlen);

		skb_pull(skb, padsize);

	}