Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38506ece authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl_pci: Start modification for new drivers 



Future patches will move the drivers for RTL8192EE and RTL8821AE
from staging to the regular wireless tree. Here, the necessary features
are added to the PCI driver. Other files are touched due to changes
in the various data structs.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fd09ff95

drivers/net/wireless/rtlwifi/core.c

+1 −14
Original line number Diff line number Diff line
@@ -129,19 +129,6 @@ void rtl_fw_cb(const struct firmware *firmware, void *context) 
	memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);

	rtlpriv->rtlhal.fwsize = firmware->size;

	release_firmware(firmware);



	err = ieee80211_register_hw(hw);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Can't register mac80211 hw\n");

		return;

	} else {

		rtlpriv->mac80211.mac80211_registered = 1;

	}

	set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);



	/*init rfkill */

	rtl_init_rfkill(hw);

}

EXPORT_SYMBOL(rtl_fw_cb);
@@ -1392,7 +1379,7 @@ static void rtl_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);



	if (rtlpriv->intf_ops->flush)

		rtlpriv->intf_ops->flush(hw, drop);

		rtlpriv->intf_ops->flush(hw, queues, drop);

}



const struct ieee80211_ops rtl_ops = {

drivers/net/wireless/rtlwifi/core.h

+3 −7
Original line number Diff line number Diff line
@@ -2,20 +2,16 @@ 
 *

 * Copyright(c) 2009-2012  Realtek Corporation.

 *

 * Tmis program is free software; you can redistribute it and/or modify it

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * Tmis program is distributed in the hope that it will be useful, but WITHOUT

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * tmis program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * Tme full GNU General Public License is included in this distribution in the

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

 * Contact Information: