sync bes2600/ to v7.0-danctnix1 baseline (rebasing reference)
This commit is contained in:
+9
-4
@@ -32,6 +32,7 @@
|
||||
#include "pm.h"
|
||||
#include "bes2600_factory.h"
|
||||
#include "bes_chardev.h"
|
||||
#include "txrx_opt.h"
|
||||
|
||||
MODULE_AUTHOR("Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>");
|
||||
MODULE_DESCRIPTION("Softmac BES2600 common code");
|
||||
@@ -198,7 +199,11 @@ static const struct ieee80211_iface_limit bes2600_if_limits[] = {
|
||||
BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
||||
BIT(NL80211_IFTYPE_P2P_GO) },
|
||||
#ifdef P2P_MULTIVIF
|
||||
{ .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) },
|
||||
/*
|
||||
* HACK: Disable P2P_DEVICE implementation for BES2600
|
||||
* as the code is a little buggy.
|
||||
*/
|
||||
//{ .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) },
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -593,7 +598,7 @@ static void bes2600_unregister_common(struct ieee80211_hw *dev)
|
||||
|
||||
ieee80211_unregister_hw(dev);
|
||||
|
||||
del_timer_sync(&hw_priv->ba_timer);
|
||||
timer_delete_sync(&hw_priv->ba_timer);
|
||||
|
||||
hw_priv->sbus_ops->irq_unsubscribe(hw_priv->sbus_priv);
|
||||
bes2600_unregister_bh(hw_priv);
|
||||
@@ -896,8 +901,8 @@ int bes2600_wifi_stop(struct bes2600_common *hw_priv)
|
||||
hw_priv->wsm_tx_seq[1] = 0;
|
||||
hw_priv->wsm_tx_pending[0] = 0;
|
||||
hw_priv->wsm_tx_pending[1] = 0;
|
||||
del_timer_sync(&hw_priv->mcu_mon_timer);
|
||||
del_timer_sync(&hw_priv->lmac_mon_timer);
|
||||
timer_delete_sync(&hw_priv->mcu_mon_timer);
|
||||
timer_delete_sync(&hw_priv->lmac_mon_timer);
|
||||
#ifdef CONFIG_BES2600_STATIC_SDD
|
||||
hw_priv->sdd = NULL;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user