mt76x2: rename struct mt76_txwi to mt76x2_txwi

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2015-12-17 01:22:56 +01:00
parent 3abdc2e96b
commit 57fea83360
4 changed files with 22 additions and 22 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ struct mt76_queue_entry {
struct sk_buff *skb;
union {
void *buf;
struct mt76_txwi_cache *txwi;
struct mt76x2_txwi_cache *txwi;
};
bool schedule;
};
+12 -12
View File
@@ -14,16 +14,16 @@
#include "mt76x2.h"
#include "mt76x2_dma.h"
struct mt76_txwi_cache {
struct mt76_txwi txwi;
struct mt76x2_txwi_cache {
struct mt76x2_txwi txwi;
dma_addr_t dma_addr;
struct list_head list;
};
static struct mt76_txwi_cache *
static struct mt76x2_txwi_cache *
mt76x2_alloc_txwi(struct mt76x2_dev *dev)
{
struct mt76_txwi_cache *t;
struct mt76x2_txwi_cache *t;
dma_addr_t addr;
int size;
@@ -38,14 +38,14 @@ mt76x2_alloc_txwi(struct mt76x2_dev *dev)
return t;
}
static struct mt76_txwi_cache *
static struct mt76x2_txwi_cache *
__mt76x2_get_txwi(struct mt76x2_dev *dev)
{
struct mt76_txwi_cache *t = NULL;
struct mt76x2_txwi_cache *t = NULL;
spin_lock_bh(&dev->lock);
if (!list_empty(&dev->txwi_cache)) {
t = list_first_entry(&dev->txwi_cache, struct mt76_txwi_cache,
t = list_first_entry(&dev->txwi_cache, struct mt76x2_txwi_cache,
list);
list_del(&t->list);
}
@@ -54,10 +54,10 @@ __mt76x2_get_txwi(struct mt76x2_dev *dev)
return t;
}
static struct mt76_txwi_cache *
static struct mt76x2_txwi_cache *
mt76x2_get_txwi(struct mt76x2_dev *dev)
{
struct mt76_txwi_cache *t = __mt76x2_get_txwi(dev);
struct mt76x2_txwi_cache *t = __mt76x2_get_txwi(dev);
if (t)
return t;
@@ -66,7 +66,7 @@ mt76x2_get_txwi(struct mt76x2_dev *dev)
}
static void
mt76x2_put_txwi(struct mt76x2_dev *dev, struct mt76_txwi_cache *t)
mt76x2_put_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi_cache *t)
{
if (!t)
return;
@@ -111,7 +111,7 @@ mt76x2_tx_queue_skb(struct mt76_dev *cdev, struct mt76_queue *q,
{
struct mt76x2_dev *dev = container_of(cdev, struct mt76x2_dev, mt76);
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct mt76_txwi_cache *t;
struct mt76x2_txwi_cache *t;
dma_addr_t addr;
u32 tx_info = 0;
int idx, ret, len;
@@ -406,7 +406,7 @@ int mt76x2_dma_init(struct mt76x2_dev *dev)
void mt76x2_dma_cleanup(struct mt76x2_dev *dev)
{
struct mt76_txwi_cache *t;
struct mt76x2_txwi_cache *t;
int i;
BUILD_BUG_ON(MT_RX_HEADROOM < sizeof(struct mt76x2_rxwi));
+4 -4
View File
@@ -153,7 +153,7 @@ void mt76x2_mac_wcid_set_rate(struct mt76x2_dev *dev, struct mt76_wcid *wcid,
spin_unlock_irqrestore(&dev->lock, flags);
}
void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76_txwi *txwi,
void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi *txwi,
struct sk_buff *skb, struct mt76_wcid *wcid,
struct ieee80211_sta *sta)
{
@@ -441,7 +441,7 @@ void mt76x2_mac_poll_tx_status(struct mt76x2_dev *dev, bool irq)
}
void mt76x2_mac_queue_txdone(struct mt76x2_dev *dev, struct sk_buff *skb,
struct mt76_txwi *txwi)
struct mt76x2_txwi *txwi)
{
struct mt76x2_tx_info *txi = mt76x2_skb_tx_info(skb);
@@ -579,9 +579,9 @@ static int
mt76_write_beacon(struct mt76x2_dev *dev, int offset, struct sk_buff *skb)
{
int beacon_len = dev->beacon_offsets[1] - dev->beacon_offsets[0];
struct mt76_txwi txwi;
struct mt76x2_txwi txwi;
if (WARN_ON_ONCE(beacon_len < skb->len + sizeof(struct mt76_txwi)))
if (WARN_ON_ONCE(beacon_len < skb->len + sizeof(struct mt76x2_txwi)))
return -ENOSPC;
mt76x2_mac_write_txwi(dev, &txwi, skb, NULL, NULL);
+5 -5
View File
@@ -19,9 +19,9 @@ struct mt76x2_sta;
struct mt76x2_vif;
struct mt76_wcid;
struct mt76_txwi;
struct mt76x2_txwi;
struct mt76_queue;
struct mt76_txwi_cache;
struct mt76x2_txwi_cache;
struct mt76x2_tx_status {
u8 valid:1;
@@ -132,7 +132,7 @@ enum mt76x2_phy_bandwith {
#define MT_TXWI_PKTID_PROBE BIT(7)
struct mt76_txwi {
struct mt76x2_txwi {
__le16 flags;
__le16 rate;
u8 ack_ctl;
@@ -161,7 +161,7 @@ void mt76x2_mac_resume(struct mt76x2_dev *dev);
void mt76x2_mac_set_bssid(struct mt76x2_dev *dev, u8 idx, const u8 *addr);
int mt76x2_mac_process_rx(struct mt76x2_dev *dev, struct sk_buff *skb, void *rxwi);
void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76_txwi *txwi,
void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi *txwi,
struct sk_buff *skb, struct mt76_wcid *wcid,
struct ieee80211_sta *sta);
void mt76x2_mac_wcid_setup(struct mt76x2_dev *dev, u8 idx, u8 vif_idx, u8 *mac);
@@ -179,7 +179,7 @@ int mt76x2_mac_set_beacon(struct mt76x2_dev *dev, u8 vif_idx, struct sk_buff *sk
void mt76x2_mac_set_beacon_enable(struct mt76x2_dev *dev, u8 vif_idx, bool val);
void mt76x2_mac_queue_txdone(struct mt76x2_dev *dev, struct sk_buff *skb,
struct mt76_txwi *txwi);
struct mt76x2_txwi *txwi);
void mt76x2_mac_poll_tx_status(struct mt76x2_dev *dev, bool irq);
void mt76x2_mac_process_tx_status_fifo(struct mt76x2_dev *dev);