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>
Subject: [PATCH v2] Revert "mt76: mt76x0e: don't use hw encryption for MT7630E"
Date:   Tue,  5 Nov 2019 11:00:32 +0100
Message-Id: <20191105100032.28556-1-sgruszka@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

This reverts commit 34b0e9b767bfa09ae233ca0d6ceb299bf2e24600.

Since commit 7bd0650be63c ("mt76: dma: fix buffer unmap with non-linear skb=
s")
is no longer necessary to disable HW encryption for MT7630E.

Disabling HW encryption helped previously because somehow fragmented
skb's are not created if mac80211 encrypt frames, so buffer unmap bug
of non-linear skbs was not triggered. Now since this bug is properly
fixed by commit 7bd0650be63c ("mt76: dma: fix buffer unmap with
non-linear skbs") , we can enable HW encryption back.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
v2: fix commit references

 drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/=
wireless/mediatek/mt76/mt76x0/pci.c
index 7705e55aa3d1..f84a7df296ea 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -51,19 +51,6 @@ static void mt76x0e_stop(struct ieee80211_hw *hw)
 =09mt76x0e_stop_hw(dev);
 }
=20
-static int
-mt76x0e_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-=09=09struct ieee80211_vif *vif, struct ieee80211_sta *sta,
-=09=09struct ieee80211_key_conf *key)
-{
-=09struct mt76x02_dev *dev =3D hw->priv;
-
-=09if (is_mt7630(dev))
-=09=09return -EOPNOTSUPP;
-
-=09return mt76x02_set_key(hw, cmd, vif, sta, key);
-}
-
 static void
 mt76x0e_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 =09      u32 queues, bool drop)
@@ -80,7 +67,7 @@ static const struct ieee80211_ops mt76x0e_ops =3D {
 =09.configure_filter =3D mt76x02_configure_filter,
 =09.bss_info_changed =3D mt76x02_bss_info_changed,
 =09.sta_state =3D mt76_sta_state,
-=09.set_key =3D mt76x0e_set_key,
+=09.set_key =3D mt76x02_set_key,
 =09.conf_tx =3D mt76x02_conf_tx,
 =09.sw_scan_start =3D mt76_sw_scan,
 =09.sw_scan_complete =3D mt76x02_sw_scan_complete,
--=20
2.20.1