update bcm4329

getitnowmarketing · Feb 11, 2012 · a131e61 · a131e61
1 parent 9c3abf1
commit a131e61
Show file tree

Hide file tree

Showing 3 changed files with 410 additions and 0 deletions.
diff --git a/drivers/net/wireless/bcm4329/dhd.h b/drivers/net/wireless/bcm4329/dhd.h
@@ -95,6 +95,7 @@ enum dhd_bus_wake_state {
 	WAKE_LOCK_SOFTAP_STOP,
 	WAKE_LOCK_SOFTAP_START,
 	WAKE_LOCK_SOFTAP_THREAD,
+	WAKE_LOCK_PROTECT,
 	WAKE_LOCK_MAX
 };
 enum dhd_prealloc_index {
@@ -377,6 +378,7 @@ typedef enum cust_gpio_modes {
 extern int wl_iw_iscan_set_scan_broadcast_prep(struct net_device *dev, uint flag);
 extern int wl_iw_send_priv_event(struct net_device *dev, char *flag);
 extern int net_os_send_hang_message(struct net_device *dev);
+extern void net_os_clear_hang_message(struct net_device *dev);
 
 /*
  * Insmod parameters for debug/test

diff --git a/drivers/net/wireless/bcm4329/dhd_linux.c b/drivers/net/wireless/bcm4329/dhd_linux.c
@@ -3159,6 +3159,16 @@ int net_os_send_hang_message(struct net_device *dev)
 	return ret;
 }
 
+void net_os_clear_hang_message(struct net_device *dev)
+{
+	dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
+
+	if (dhd)
+		dhd->hang_was_sent = 0;
+
+	return;
+}
+
 void dhd_bus_country_set(struct net_device *dev, wl_country_t *cspec)
 {
 	dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);