Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Stanislaw Gruszka <sgruszka@redhat.com>
To:     linux-wireless@vger.kernel.org
Cc:     Felix Fietkau <nbd@nbd.name>,
        Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>,
        Ryder Lee <ryder.lee@mediatek.com>,
        Roy Luo <royluo@google.com>,
        Markus Theil <markus.theil@tu-ilmenau.de>
Subject: [PATCH 3/3] mt76: mt76x02: minor mt76x02_mac_set_beacon optimization
Date:   Fri, 29 Nov 2019 13:32:28 +0100
Message-Id: <1575030748-2218-4-git-send-email-sgruszka@redhat.com>
In-Reply-To: <1575030748-2218-1-git-send-email-sgruszka@redhat.com>
References: <1575030748-2218-1-git-send-email-sgruszka@redhat.com>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

We do not call mt76x02_mac_set_beacon() with NULL skb any longer and
we do not need to return error value.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c | 14 ++++----------
 drivers/net/wireless/mediatek/mt76/mt76x02_mac.h    |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/=
net/wireless/mediatek/mt76/mt76x02_beacon.c
index 68a4f512319e..3cc5226b05c1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
@@ -67,21 +67,15 @@ void mt76x02_mac_set_beacon_finish(struct mt76x02_dev *=
dev)
 }
 EXPORT_SYMBOL_GPL(mt76x02_mac_set_beacon_finish);
=20
-int mt76x02_mac_set_beacon(struct mt76x02_dev *dev,
-=09=09=09   struct sk_buff *skb)
+void mt76x02_mac_set_beacon(struct mt76x02_dev *dev,
+=09=09=09    struct sk_buff *skb)
 {
 =09int bcn_len =3D dev->beacon_ops->slot_size;
 =09int bcn_addr =3D MT_BEACON_BASE + (bcn_len * dev->beacon_data_count);
-=09int ret =3D 0;
-
-=09if (skb) {
-=09=09ret =3D mt76x02_write_beacon(dev, bcn_addr, skb);
-=09=09if (!ret)
-=09=09=09dev->beacon_data_count++;
-=09}
=20
+=09if (!mt76x02_write_beacon(dev, bcn_addr, skb))
+=09=09dev->beacon_data_count++;
 =09dev_kfree_skb(skb);
-=09return ret;
 }
 EXPORT_SYMBOL_GPL(mt76x02_mac_set_beacon);
=20
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net=
/wireless/mediatek/mt76/mt76x02_mac.h
index f67f66f65ee0..5d6411ee44ce 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
@@ -201,7 +201,7 @@ void mt76x02_tx_complete_skb(struct mt76_dev *mdev, enu=
m mt76_txq_id qid,
=20
 void mt76x02_mac_cc_reset(struct mt76x02_dev *dev);
 void mt76x02_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr=
);
-int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, struct sk_buff *skb);
+void mt76x02_mac_set_beacon(struct mt76x02_dev *dev, struct sk_buff *skb);
 void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
 =09=09=09=09   struct ieee80211_vif *vif, bool enable);
 void mt76x02_mac_set_beacon_prepare(struct mt76x02_dev *dev);
--=20
1.9.3