diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 14:13:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 14:13:36 -0700 |
| commit | 68762f3d8e7ea644fae1f490f9850ebf462548bd (patch) | |
| tree | 81be52e9ba33fc4d8aa5f569aaab77b5a34e09ab /net/mac80211/debugfs_key.h | |
| parent | 4f7a307dc6e4d8bfeb56f7cf7231b08cb845687c (diff) | |
| parent | 7544b0972c1fc1a0e6c54baa1f44c81019743daa (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TG3]: Add TG3_FLAG_SUPPORT_MSI flag.
[TG3]: Eliminate the TG3_FLAG_5701_REG_WRITE_BUG flag.
[TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag.
[TG3]: Remove reset during MAC address changes.
[TG3]: WoL fixes.
[TG3]: Clear GPIO mask before storing.
[TG3]: Improve NVRAM sizing.
[TG3]: Fix TSO bugs.
[MAC80211]: Add maintainers entry for mac80211.
[MAC80211]: Add debugfs attributes.
[MAC80211]: Add mac80211 wireless stack.
[MAC80211]: Add generic include/linux/ieee80211.h
[NETLINK]: Remove references to process ID
[AF_IUCV]: Compile fix - adopt to skbuff changes.
Diffstat (limited to 'net/mac80211/debugfs_key.h')
| -rw-r--r-- | net/mac80211/debugfs_key.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/net/mac80211/debugfs_key.h b/net/mac80211/debugfs_key.h new file mode 100644 index 00000000000..aecfce395da --- /dev/null +++ b/net/mac80211/debugfs_key.h @@ -0,0 +1,34 @@ +#ifndef __MAC80211_DEBUGFS_KEY_H +#define __MAC80211_DEBUGFS_KEY_H + +#ifdef CONFIG_MAC80211_DEBUGFS +void ieee80211_debugfs_key_add(struct ieee80211_local *local, + struct ieee80211_key *key); +void ieee80211_debugfs_key_remove(struct ieee80211_key *key); +void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata); +void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata); +void ieee80211_debugfs_key_sta_link(struct ieee80211_key *key, + struct sta_info *sta); +void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, + struct sta_info *sta); +#else +static inline void ieee80211_debugfs_key_add(struct ieee80211_local *local, + struct ieee80211_key *key) +{} +static inline void ieee80211_debugfs_key_remove(struct ieee80211_key *key) +{} +static inline void ieee80211_debugfs_key_add_default( + struct ieee80211_sub_if_data *sdata) +{} +static inline void ieee80211_debugfs_key_remove_default( + struct ieee80211_sub_if_data *sdata) +{} +static inline void ieee80211_debugfs_key_sta_link( + struct ieee80211_key *key, struct sta_info *sta) +{} +static inline void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, + struct sta_info *sta) +{} +#endif + +#endif /* __MAC80211_DEBUGFS_KEY_H */ |