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

Commit 9788864e authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

iwlwifi: do not clear GEO_CONFIGURED bit when calling _down 



The geos information is set up during probe and should only
be removed during pci_remove, not during _down.
This is a temporary fix until the setting of the status bits
have been cleaned up (to explicitly match all setting with
clearing of status bits).

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a97b1f3d

drivers/net/wireless/iwlwifi/iwl3945-base.c

+4 −0
Original line number Diff line number Diff line
@@ -6256,6 +6256,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv) 
					STATUS_RF_KILL_HW |

			       test_bit(STATUS_RF_KILL_SW, &priv->status) <<

					STATUS_RF_KILL_SW |

			       test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<

					STATUS_GEO_CONFIGURED |

			       test_bit(STATUS_IN_SUSPEND, &priv->status) <<

					STATUS_IN_SUSPEND;

		goto exit;
@@ -6267,6 +6269,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv) 
				STATUS_RF_KILL_HW |

			test_bit(STATUS_RF_KILL_SW, &priv->status) <<

				STATUS_RF_KILL_SW |

			test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<

				STATUS_GEO_CONFIGURED |

			test_bit(STATUS_IN_SUSPEND, &priv->status) <<

				STATUS_IN_SUSPEND |

			test_bit(STATUS_FW_ERROR, &priv->status) <<

drivers/net/wireless/iwlwifi/iwl4965-base.c

+4 −0
Original line number Diff line number Diff line
@@ -6680,6 +6680,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv) 
					STATUS_RF_KILL_HW |

			       test_bit(STATUS_RF_KILL_SW, &priv->status) <<

					STATUS_RF_KILL_SW |

			       test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<

					STATUS_GEO_CONFIGURED |

			       test_bit(STATUS_IN_SUSPEND, &priv->status) <<

					STATUS_IN_SUSPEND;

		goto exit;
@@ -6691,6 +6693,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv) 
				STATUS_RF_KILL_HW |

			test_bit(STATUS_RF_KILL_SW, &priv->status) <<

				STATUS_RF_KILL_SW |

			test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<

				STATUS_GEO_CONFIGURED |

			test_bit(STATUS_IN_SUSPEND, &priv->status) <<

				STATUS_IN_SUSPEND |

			test_bit(STATUS_FW_ERROR, &priv->status) <<