diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-08 00:04:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:10:33 -0400 |
| commit | c60c99298c50b698b0bbbe0e0146c965c322b8c1 (patch) | |
| tree | 868d5991faa4dbb756778146a2d4b73c9874ae3a /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | a043dfb90e0472049baabc4cc9168e1fe2bd7a90 (diff) | |
| download | kernel_replicant_linux-c60c99298c50b698b0bbbe0e0146c965c322b8c1.tar.gz kernel_replicant_linux-c60c99298c50b698b0bbbe0e0146c965c322b8c1.tar.bz2 kernel_replicant_linux-c60c99298c50b698b0bbbe0e0146c965c322b8c1.zip | |
ath9k_common: remove ath9k_cmn_padpos
It is equivalent to ieee80211_hdrlen
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 89a64411b82e..94b2ee1220db 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -1971,7 +1971,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb, } /* 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) @@ -2033,7 +2033,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, /* Frame was ACKed */ tx_info->flags |= IEEE80211_TX_STAT_ACK; - padpos = ath9k_cmn_padpos(hdr->frame_control); + padpos = ieee80211_hdrlen(hdr->frame_control); padsize = padpos & 3; if (padsize && skb->len>padpos+padsize) { /* |