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

Commit 33b5d30c authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 3013dc0c c27111e5

drivers/net/wireless/rtlwifi/pci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1501,7 +1501,7 @@ static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev) 
		return err;

		return err;

	}

	}





	return 1;

	return 0;

}

}





static int rtl_pci_start(struct ieee80211_hw *hw)

static int rtl_pci_start(struct ieee80211_hw *hw)
@@ -1870,7 +1870,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, 
	}

	}





	/* Init PCI sw */

	/* Init PCI sw */

	err = !rtl_pci_init(hw, pdev);

	err = rtl_pci_init(hw, pdev);

	if (err) {

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 ("Failed to init PCI.\n"));

			 ("Failed to init PCI.\n"));

net/mac80211/main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -910,6 +910,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
		wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",

		wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",

			    result);

			    result);





	ieee80211_led_init(local);



	rtnl_lock();

	rtnl_lock();





	result = ieee80211_init_rate_ctrl_alg(local,

	result = ieee80211_init_rate_ctrl_alg(local,
@@ -931,8 +933,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 




	rtnl_unlock();

	rtnl_unlock();





	ieee80211_led_init(local);



	local->network_latency_notifier.notifier_call =

	local->network_latency_notifier.notifier_call =

		ieee80211_max_network_latency;

		ieee80211_max_network_latency;

	result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY,

	result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY,