Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90488
b: refs/heads/master
c: c8381fd
h: refs/heads/master
v: v3
  • Loading branch information
Mohamed Abbas authored and John W. Linville committed Apr 1, 2008
1 parent 914a43e commit 787b81c
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0675abdbfbcb8e0253a970c0dfe8d23b112888f3
refs/heads/master: c8381fdcab98b74f670d879097bab35d97d88400
21 changes: 21 additions & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,3 +249,24 @@ int iwl_setup(struct iwl_priv *priv)
}
EXPORT_SYMBOL(iwl_setup);

/* Low level driver call this function to update iwlcore with
* driver status.
*/
int iwlcore_low_level_notify(struct iwl_priv *priv,
enum iwlcore_card_notify notify)
{
switch (notify) {
case IWLCORE_INIT_EVT:
break;
case IWLCORE_START_EVT:
break;
case IWLCORE_STOP_EVT:
break;
case IWLCORE_REMOVE_EVT:
break;
}

return 0;
}
EXPORT_SYMBOL(iwlcore_low_level_notify);

9 changes: 9 additions & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,13 @@ int iwl_send_cmd_pdu_async(struct iwl_priv *priv, u8 id, u16 len,
struct iwl_cmd *cmd,
struct sk_buff *skb));

enum iwlcore_card_notify {
IWLCORE_INIT_EVT = 0,
IWLCORE_START_EVT = 1,
IWLCORE_STOP_EVT = 2,
IWLCORE_REMOVE_EVT = 3,
};

int iwlcore_low_level_notify(struct iwl_priv *priv,
enum iwlcore_card_notify notify);
#endif /* __iwl_core_h__ */
6 changes: 6 additions & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -5724,6 +5724,7 @@ static void iwl4965_alive_start(struct iwl_priv *priv)
if (priv->error_recovering)
iwl4965_error_recovery(priv);

iwlcore_low_level_notify(priv, IWLCORE_START_EVT);
return;

restart:
Expand All @@ -5747,6 +5748,8 @@ static void __iwl4965_down(struct iwl_priv *priv)

iwl_leds_unregister(priv);

iwlcore_low_level_notify(priv, IWLCORE_STOP_EVT);

iwlcore_clear_stations_table(priv);

/* Unblock any waiting calls */
Expand Down Expand Up @@ -8167,6 +8170,8 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
pci_save_state(pdev);
pci_disable_device(pdev);

/* notify iwlcore to init */
iwlcore_low_level_notify(priv, IWLCORE_INIT_EVT);
return 0;

out_remove_sysfs:
Expand Down Expand Up @@ -8209,6 +8214,7 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
}
}

iwlcore_low_level_notify(priv, IWLCORE_REMOVE_EVT);
iwl_dbgfs_unregister(priv);
sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group);

Expand Down

0 comments on commit 787b81c

Please sign in to comment.