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

Commit 7d42081a authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

mac80211: do not print WARN if config interface 



It is expected that config interface will always succeed as mac80211
will only request what driver supports. The exception here is when a
device has rfkill enabled. At this time the rfkill state is unknown to
mac80211 and config interface can fail. When this happens we deal with
this error instead of printing a WARN.

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 71d449b5

net/mac80211/pm.c

+13 −2
Original line number Diff line number Diff line
@@ -156,7 +156,18 @@ int __ieee80211_resume(struct ieee80211_hw *hw) 
		case NL80211_IFTYPE_ADHOC:

		case NL80211_IFTYPE_AP:

		case NL80211_IFTYPE_MESH_POINT:

			WARN_ON(ieee80211_if_config(sdata, changed));

			/*

			 * Driver's config_interface can fail if rfkill is

			 * enabled. Accommodate this return code.

			 * FIXME: When mac80211 has knowledge of rfkill

			 * state the code below can change back to:

			 *   WARN(ieee80211_if_config(sdata, changed));

			 *   ieee80211_bss_info_change_notify(sdata, ~0);

			 */

			if (ieee80211_if_config(sdata, changed))

				printk(KERN_DEBUG "%s: failed to configure interface during resume\n",

				       sdata->dev->name);

			else

				ieee80211_bss_info_change_notify(sdata, ~0);

			break;

		case NL80211_IFTYPE_WDS: