Revert "carl9170: prevent speculative execution"

CVE-2017-5753 (revert embargoed)
CVE-2017-5715 (revert embargoed)

This reverts commit dc218eba4fe8241ab073be41a068f6796450c6d0.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 7e2c1c870a1d6395c7eff17b6911d87548f8ea5a..988c8857d78c9d21abbe3b007ce605b13e04b109 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1388,7 +1388,6 @@ static int carl9170_op_conf_tx(struct ieee80211_hw *hw,
 
        mutex_lock(&ar->mutex);
        if (queue < ar->hw->queues) {
-               gmb();
                memcpy(&ar->edcf[ar9170_qmap[queue]], param, sizeof(*param));
                ret = carl9170_set_qos(ar);
        } else {