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

Commit ac91f910 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: move notification wait into core 



This code is a library to be used by multiple
opmodes, so move it into the iwlwifi module.

Reviewed-by: default avatarDonald H Fry <donald.h.fry@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cc5f7e39

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ iwldvm-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o 
iwldvm-objs		+= iwl-eeprom.o iwl-power.o

iwldvm-objs		+= iwl-scan.o iwl-led.o

iwldvm-objs		+= iwl-agn-rxon.o iwl-agn-devices.o

iwldvm-objs		+= iwl-notif-wait.o



iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwldvm-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
@@ -24,6 +23,7 @@ iwlwifi-objs += iwl-io.o 
iwlwifi-objs		+= iwl-pci.o

iwlwifi-objs		+= iwl-drv.o

iwlwifi-objs		+= iwl-debug.o

iwlwifi-objs		+= iwl-notif-wait.o

iwlwifi-objs		+= iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o



iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

drivers/net/wireless/iwlwifi/iwl-notif-wait.c

+7 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
 *

 *****************************************************************************/

#include <linux/sched.h>

#include <linux/export.h>



#include "iwl-notif-wait.h"
@@ -71,6 +72,7 @@ void iwl_notification_wait_init(struct iwl_notif_wait_data *notif_wait) 
	INIT_LIST_HEAD(&notif_wait->notif_waits);

	init_waitqueue_head(&notif_wait->notif_waitq);

}

EXPORT_SYMBOL_GPL(iwl_notification_wait_init);



void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,

				  struct iwl_rx_packet *pkt)
@@ -115,6 +117,7 @@ void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait, 
	if (triggered)

		wake_up_all(&notif_wait->notif_waitq);

}

EXPORT_SYMBOL_GPL(iwl_notification_wait_notify);



void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)

{
@@ -128,7 +131,7 @@ void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait) 


	wake_up_all(&notif_wait->notif_waitq);

}



EXPORT_SYMBOL_GPL(iwl_abort_notification_waits);



void

iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
@@ -152,6 +155,7 @@ iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait, 
	list_add(&wait_entry->list, &notif_wait->notif_waits);

	spin_unlock_bh(&notif_wait->notif_wait_lock);

}

EXPORT_SYMBOL_GPL(iwl_init_notification_wait);



int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,

			  struct iwl_notification_wait *wait_entry,
@@ -175,6 +179,7 @@ int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait, 
		return -ETIMEDOUT;

	return 0;

}

EXPORT_SYMBOL_GPL(iwl_wait_notification);



void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,

			     struct iwl_notification_wait *wait_entry)
@@ -183,3 +188,4 @@ void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait, 
	list_del(&wait_entry->list);

	spin_unlock_bh(&notif_wait->notif_wait_lock);

}

EXPORT_SYMBOL_GPL(iwl_remove_notification);