diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-25 19:34:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-25 19:34:56 -0500 |
| commit | d346f49d0badd80aa9fc699fa9c6d5b23e778eb6 (patch) | |
| tree | 9e9698ffe7966fbe7ce924a30843f87cdfa2646e /net/mac80211/debugfs_key.c | |
| parent | d87fd25d5ac4cd044e21b749a8f6cac90f093c71 (diff) | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/debugfs_key.c')
| -rw-r--r-- | net/mac80211/debugfs_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index e0f5224630da..d12e743cb4e1 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c | |||
| @@ -56,7 +56,7 @@ KEY_CONF_FILE(keyidx, D); | |||
| 56 | KEY_CONF_FILE(hw_key_idx, D); | 56 | KEY_CONF_FILE(hw_key_idx, D); |
| 57 | KEY_FILE(flags, X); | 57 | KEY_FILE(flags, X); |
| 58 | KEY_FILE(tx_rx_count, D); | 58 | KEY_FILE(tx_rx_count, D); |
| 59 | KEY_READ(ifindex, sdata->dev->ifindex, 20, "%d\n"); | 59 | KEY_READ(ifindex, sdata->name, IFNAMSIZ + 2, "%s\n"); |
| 60 | KEY_OPS(ifindex); | 60 | KEY_OPS(ifindex); |
| 61 | 61 | ||
| 62 | static ssize_t key_algorithm_read(struct file *file, | 62 | static ssize_t key_algorithm_read(struct file *file, |