aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/debugfs.c21
-rw-r--r--net/mac80211/debugfs_key.c2
-rw-r--r--net/mac80211/debugfs_netdev.c1
-rw-r--r--net/mac80211/debugfs_sta.c2
-rw-r--r--net/mac80211/rate.c1
-rw-r--r--net/mac80211/rc80211_minstrel_debugfs.c1
-rw-r--r--net/mac80211/rc80211_minstrel_ht_debugfs.c3
-rw-r--r--net/mac80211/rc80211_pid_debugfs.c1
8 files changed, 25 insertions, 7 deletions
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index ebd5b69f562e..18260aa99c56 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -36,6 +36,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \
36static const struct file_operations name## _ops = { \ 36static const struct file_operations name## _ops = { \
37 .read = name## _read, \ 37 .read = name## _read, \
38 .open = mac80211_open_file_generic, \ 38 .open = mac80211_open_file_generic, \
39 .llseek = generic_file_llseek, \
39}; 40};
40 41
41#define DEBUGFS_ADD(name) \ 42#define DEBUGFS_ADD(name) \
@@ -103,7 +104,8 @@ static ssize_t tsf_write(struct file *file,
103static const struct file_operations tsf_ops = { 104static const struct file_operations tsf_ops = {
104 .read = tsf_read, 105 .read = tsf_read,
105 .write = tsf_write, 106 .write = tsf_write,
106 .open = mac80211_open_file_generic 107 .open = mac80211_open_file_generic,
108 .llseek = default_llseek,
107}; 109};
108 110
109static ssize_t reset_write(struct file *file, const char __user *user_buf, 111static ssize_t reset_write(struct file *file, const char __user *user_buf,
@@ -122,6 +124,7 @@ static ssize_t reset_write(struct file *file, const char __user *user_buf,
122static const struct file_operations reset_ops = { 124static const struct file_operations reset_ops = {
123 .write = reset_write, 125 .write = reset_write,
124 .open = mac80211_open_file_generic, 126 .open = mac80211_open_file_generic,
127 .llseek = noop_llseek,
125}; 128};
126 129
127static ssize_t noack_read(struct file *file, char __user *user_buf, 130static ssize_t noack_read(struct file *file, char __user *user_buf,
@@ -157,7 +160,8 @@ static ssize_t noack_write(struct file *file,
157static const struct file_operations noack_ops = { 160static const struct file_operations noack_ops = {
158 .read = noack_read, 161 .read = noack_read,
159 .write = noack_write, 162 .write = noack_write,
160 .open = mac80211_open_file_generic 163 .open = mac80211_open_file_generic,
164 .llseek = default_llseek,
161}; 165};
162 166
163static ssize_t uapsd_queues_read(struct file *file, char __user *user_buf, 167static ssize_t uapsd_queues_read(struct file *file, char __user *user_buf,
@@ -203,7 +207,8 @@ static ssize_t uapsd_queues_write(struct file *file,
203static const struct file_operations uapsd_queues_ops = { 207static const struct file_operations uapsd_queues_ops = {
204 .read = uapsd_queues_read, 208 .read = uapsd_queues_read,
205 .write = uapsd_queues_write, 209 .write = uapsd_queues_write,
206 .open = mac80211_open_file_generic 210 .open = mac80211_open_file_generic,
211 .llseek = default_llseek,
207}; 212};
208 213
209static ssize_t uapsd_max_sp_len_read(struct file *file, char __user *user_buf, 214static ssize_t uapsd_max_sp_len_read(struct file *file, char __user *user_buf,
@@ -249,7 +254,8 @@ static ssize_t uapsd_max_sp_len_write(struct file *file,
249static const struct file_operations uapsd_max_sp_len_ops = { 254static const struct file_operations uapsd_max_sp_len_ops = {
250 .read = uapsd_max_sp_len_read, 255 .read = uapsd_max_sp_len_read,
251 .write = uapsd_max_sp_len_write, 256 .write = uapsd_max_sp_len_write,
252 .open = mac80211_open_file_generic 257 .open = mac80211_open_file_generic,
258 .llseek = default_llseek,
253}; 259};
254 260
255static ssize_t channel_type_read(struct file *file, char __user *user_buf, 261static ssize_t channel_type_read(struct file *file, char __user *user_buf,
@@ -281,7 +287,8 @@ static ssize_t channel_type_read(struct file *file, char __user *user_buf,
281 287
282static const struct file_operations channel_type_ops = { 288static const struct file_operations channel_type_ops = {
283 .read = channel_type_read, 289 .read = channel_type_read,
284 .open = mac80211_open_file_generic 290 .open = mac80211_open_file_generic,
291 .llseek = default_llseek,
285}; 292};
286 293
287static ssize_t queues_read(struct file *file, char __user *user_buf, 294static ssize_t queues_read(struct file *file, char __user *user_buf,
@@ -304,7 +311,8 @@ static ssize_t queues_read(struct file *file, char __user *user_buf,
304 311
305static const struct file_operations queues_ops = { 312static const struct file_operations queues_ops = {
306 .read = queues_read, 313 .read = queues_read,
307 .open = mac80211_open_file_generic 314 .open = mac80211_open_file_generic,
315 .llseek = default_llseek,
308}; 316};
309 317
310/* statistics stuff */ 318/* statistics stuff */
@@ -348,6 +356,7 @@ static ssize_t stats_ ##name## _read(struct file *file, \
348static const struct file_operations stats_ ##name## _ops = { \ 356static const struct file_operations stats_ ##name## _ops = { \
349 .read = stats_ ##name## _read, \ 357 .read = stats_ ##name## _read, \
350 .open = mac80211_open_file_generic, \ 358 .open = mac80211_open_file_generic, \
359 .llseek = generic_file_llseek, \
351}; 360};
352 361
353#define DEBUGFS_STATS_ADD(name, field) \ 362#define DEBUGFS_STATS_ADD(name, field) \
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index 1647f8dc5cda..4aa47d074a79 100644
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -32,6 +32,7 @@ static ssize_t key_##name##_read(struct file *file, \
32static const struct file_operations key_ ##name## _ops = { \ 32static const struct file_operations key_ ##name## _ops = { \
33 .read = key_##name##_read, \ 33 .read = key_##name##_read, \
34 .open = mac80211_open_file_generic, \ 34 .open = mac80211_open_file_generic, \
35 .llseek = generic_file_llseek, \
35} 36}
36 37
37#define KEY_FILE(name, format) \ 38#define KEY_FILE(name, format) \
@@ -46,6 +47,7 @@ static const struct file_operations key_ ##name## _ops = { \
46static const struct file_operations key_ ##name## _ops = { \ 47static const struct file_operations key_ ##name## _ops = { \
47 .read = key_conf_##name##_read, \ 48 .read = key_conf_##name##_read, \
48 .open = mac80211_open_file_generic, \ 49 .open = mac80211_open_file_generic, \
50 .llseek = generic_file_llseek, \
49} 51}
50 52
51#define KEY_CONF_FILE(name, format) \ 53#define KEY_CONF_FILE(name, format) \
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 3e12430591b7..cbdf36d7841c 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -121,6 +121,7 @@ static const struct file_operations name##_ops = { \
121 .read = ieee80211_if_read_##name, \ 121 .read = ieee80211_if_read_##name, \
122 .write = (_write), \ 122 .write = (_write), \
123 .open = mac80211_open_file_generic, \ 123 .open = mac80211_open_file_generic, \
124 .llseek = generic_file_llseek, \
124} 125}
125 126
126#define __IEEE80211_IF_FILE_W(name) \ 127#define __IEEE80211_IF_FILE_W(name) \
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 50c40ea3cb4d..4601fea1784d 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -36,6 +36,7 @@ static ssize_t sta_ ##name## _read(struct file *file, \
36static const struct file_operations sta_ ##name## _ops = { \ 36static const struct file_operations sta_ ##name## _ops = { \
37 .read = sta_##name##_read, \ 37 .read = sta_##name##_read, \
38 .open = mac80211_open_file_generic, \ 38 .open = mac80211_open_file_generic, \
39 .llseek = generic_file_llseek, \
39} 40}
40 41
41#define STA_OPS_RW(name) \ 42#define STA_OPS_RW(name) \
@@ -43,6 +44,7 @@ static const struct file_operations sta_ ##name## _ops = { \
43 .read = sta_##name##_read, \ 44 .read = sta_##name##_read, \
44 .write = sta_##name##_write, \ 45 .write = sta_##name##_write, \
45 .open = mac80211_open_file_generic, \ 46 .open = mac80211_open_file_generic, \
47 .llseek = generic_file_llseek, \
46} 48}
47 49
48#define STA_FILE(name, field, format) \ 50#define STA_FILE(name, field, format) \
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index b0cc385bf989..809cf230d251 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -145,6 +145,7 @@ static ssize_t rcname_read(struct file *file, char __user *userbuf,
145static const struct file_operations rcname_ops = { 145static const struct file_operations rcname_ops = {
146 .read = rcname_read, 146 .read = rcname_read,
147 .open = mac80211_open_file_generic, 147 .open = mac80211_open_file_generic,
148 .llseek = default_llseek,
148}; 149};
149#endif 150#endif
150 151
diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index 241e76f3fdf2..a290ad231d77 100644
--- a/net/mac80211/rc80211_minstrel_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_debugfs.c
@@ -122,6 +122,7 @@ static const struct file_operations minstrel_stat_fops = {
122 .open = minstrel_stats_open, 122 .open = minstrel_stats_open,
123 .read = minstrel_stats_read, 123 .read = minstrel_stats_read,
124 .release = minstrel_stats_release, 124 .release = minstrel_stats_release,
125 .llseek = default_llseek,
125}; 126};
126 127
127void 128void
diff --git a/net/mac80211/rc80211_minstrel_ht_debugfs.c b/net/mac80211/rc80211_minstrel_ht_debugfs.c
index 4a5a4b3e7799..cefcb5d2dae6 100644
--- a/net/mac80211/rc80211_minstrel_ht_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c
@@ -90,7 +90,7 @@ minstrel_ht_stats_open(struct inode *inode, struct file *file)
90 MINSTREL_TRUNC(mi->avg_ampdu_len * 10) % 10); 90 MINSTREL_TRUNC(mi->avg_ampdu_len * 10) % 10);
91 ms->len = p - ms->buf; 91 ms->len = p - ms->buf;
92 92
93 return 0; 93 return nonseekable_open(inode, file);
94} 94}
95 95
96static const struct file_operations minstrel_ht_stat_fops = { 96static const struct file_operations minstrel_ht_stat_fops = {
@@ -98,6 +98,7 @@ static const struct file_operations minstrel_ht_stat_fops = {
98 .open = minstrel_ht_stats_open, 98 .open = minstrel_ht_stats_open,
99 .read = minstrel_stats_read, 99 .read = minstrel_stats_read,
100 .release = minstrel_stats_release, 100 .release = minstrel_stats_release,
101 .llseek = no_llseek,
101}; 102};
102 103
103void 104void
diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
index 135f36fd4d5d..4851e9e2daed 100644
--- a/net/mac80211/rc80211_pid_debugfs.c
+++ b/net/mac80211/rc80211_pid_debugfs.c
@@ -206,6 +206,7 @@ static const struct file_operations rc_pid_fop_events = {
206 .poll = rate_control_pid_events_poll, 206 .poll = rate_control_pid_events_poll,
207 .open = rate_control_pid_events_open, 207 .open = rate_control_pid_events_open,
208 .release = rate_control_pid_events_release, 208 .release = rate_control_pid_events_release,
209 .llseek = noop_llseek,
209}; 210};
210 211
211void rate_control_pid_add_sta_debugfs(void *priv, void *priv_sta, 212void rate_control_pid_add_sta_debugfs(void *priv, void *priv_sta,