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

Commit c4363d6a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 17c99297 f8036965

drivers/net/wireless/ath/ath9k/hif_usb.c

+6 −2
Original line number Diff line number Diff line
@@ -730,13 +730,17 @@ static int ath9k_hif_usb_alloc_urbs(struct hif_device_usb *hif_dev) 


	/* RX */

	if (ath9k_hif_usb_alloc_rx_urbs(hif_dev) < 0)

		goto err;

		goto err_rx;



	/* Register Read */

	if (ath9k_hif_usb_alloc_reg_in_urb(hif_dev) < 0)

		goto err;

		goto err_reg;



	return 0;

err_reg:

	ath9k_hif_usb_dealloc_rx_urbs(hif_dev);

err_rx:

	ath9k_hif_usb_dealloc_tx_urbs(hif_dev);

err:

	return -ENOMEM;

}

drivers/net/wireless/iwlwifi/iwl-sta.h

+11 −0
Original line number Diff line number Diff line
@@ -97,6 +97,17 @@ static inline void iwl_clear_driver_stations(struct iwl_priv *priv) 
	spin_lock_irqsave(&priv->sta_lock, flags);

	memset(priv->stations, 0, sizeof(priv->stations));

	priv->num_stations = 0;



	/*

	 * Remove all key information that is not stored as part of station

	 * information since mac80211 may not have had a

	 * chance to remove all the keys. When device is reconfigured by

	 * mac80211 after an error all keys will be reconfigured.

	 */

	priv->ucode_key_table = 0;

	priv->key_mapping_key = 0;

	memset(priv->wep_keys, 0, sizeof(priv->wep_keys));



	spin_unlock_irqrestore(&priv->sta_lock, flags);

}