mt76x0: simplify mt76_mac_process_rx signature

Remove data pointer from mt76_mac_process_rx routine signature

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/dma.c b/drivers/net/wireless/mediatek/mt76/mt76x0/dma.c
index f294028..82c2b37 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/dma.c
@@ -44,7 +44,7 @@ mt76x0_rx_skb_from_seg(struct mt76x0_dev *dev, struct mt76x02_rxwi *rxwi,
        if (!skb)
                return NULL;
 
-       true_len = mt76x0_mac_process_rx(dev, skb, data, rxwi);
+       true_len = mt76x0_mac_process_rx(dev, skb, rxwi);
        if (!true_len || true_len > seg_len)
                goto bad_frame;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mac.c b/drivers/net/wireless/mediatek/mt76/mt76x0/mac.c
index 99e2e12..2d8abeb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mac.c
@@ -213,7 +213,7 @@ mt76x0_rx_is_our_beacon(struct mt76x0_dev *dev, u8 *data)
 }
 
 u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb,
-                       u8 *data, void *rxi)
+                       void *rxi)
 {
        struct mt76_rx_status *status = (struct mt76_rx_status *) skb->cb;
        struct mt76x02_rxwi *rxwi = rxi;
@@ -239,7 +239,7 @@ u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb,
        mt76x02_mac_process_rate(status, rate);
 
        spin_lock_bh(&dev->con_mon_lock);
-       if (mt76x0_rx_is_our_beacon(dev, data)) {
+       if (mt76x0_rx_is_our_beacon(dev, skb->data)) {
                mt76x0_rx_monitor_beacon(dev, rxwi, rate, rssi);
        } else if (rxwi->rxinfo & cpu_to_le32(MT_RXINFO_UNICAST)) {
                if (dev->avg_rssi == 0)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mac.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mac.h
index abce22a..b887693 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mac.h
@@ -16,5 +16,5 @@
 #define __MT76_MAC_H
 
 u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb,
-                       u8 *data, void *rxi);
+                       void *rxi);
 #endif