Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278447
b: refs/heads/master
c: ebfa867
h: refs/heads/master
i:
  278445: b84ed40
  278443: 456dbde
  278439: 9f03c7e
  278431: 7fa1c2d
v: v3
  • Loading branch information
Wey-Yi Guy authored and John W. Linville committed Nov 28, 2011
1 parent e8770b6 commit b70dcd3
Show file tree
Hide file tree
Showing 2 changed files with 33 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: 9d5fa6181914371883be880ed3adc1bca2f26cba
refs/heads/master: ebfa867dd939839436fe8fed8122b9e5d30841f6
32 changes: 32 additions & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1682,6 +1682,35 @@ static int iwl_set_hw_params(struct iwl_priv *priv)



static void iwl_debug_config(struct iwl_priv *priv)
{
dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEBUG "
#ifdef CONFIG_IWLWIFI_DEBUG
"enabled\n");
#else
"disabled\n");
#endif
dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEBUGFS "
#ifdef CONFIG_IWLWIFI_DEBUGFS
"enabled\n");
#else
"disabled\n");
#endif
dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEVICE_TRACING "
#ifdef CONFIG_IWLWIFI_DEVICE_TRACING
"enabled\n");
#else
"disabled\n");
#endif

dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEVICE_SVTOOL "
#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
"enabled\n");
#else
"disabled\n");
#endif
}

int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
struct iwl_cfg *cfg)
{
Expand Down Expand Up @@ -1717,6 +1746,9 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,

SET_IEEE80211_DEV(hw, bus(priv)->dev);

/* what debugging capabilities we have */
iwl_debug_config(priv);

IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
priv->cfg = cfg;

Expand Down

0 comments on commit b70dcd3

Please sign in to comment.