Skip to content

Commit

Permalink
net/wireless: use generic_file_llseek in debugfs
Browse files Browse the repository at this point in the history
The default llseek operation is changing from
default_llseek to no_llseek, so all code relying on
the current behaviour needs to make that explicit.

The wireless driver infrastructure and some of the drivers
make use of generated debugfs files, so they cannot
be converted by our script that automatically determines
the right operation.

All these files use debugfs and they typically rely
on simple_read_from_buffer, so the best llseek operation
here is generic_file_llseek.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
  • Loading branch information
Arnd Bergmann committed Sep 16, 2010
1 parent dc880ab commit 2b18ab3
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/misc/iwmc3200top/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,15 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file, \
static const struct file_operations iwmct_dbgfs_##name##_ops = { \
.read = iwmct_dbgfs_##name##_read, \
.open = iwmct_dbgfs_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_WRITE_FILE_OPS(name) \
DEBUGFS_WRITE_FUNC(name) \
static const struct file_operations iwmct_dbgfs_##name##_ops = { \
.write = iwmct_dbgfs_##name##_write, \
.open = iwmct_dbgfs_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_READ_WRITE_FILE_OPS(name) \
Expand All @@ -87,6 +89,7 @@ ssize_t iwmct_dbgfs_##name##_write(struct file *file, \
.write = iwmct_dbgfs_##name##_write, \
.read = iwmct_dbgfs_##name##_read, \
.open = iwmct_dbgfs_open_file_generic, \
.llseek = generic_file_llseek, \
};


Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/b43/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,7 @@ static ssize_t b43_debugfs_write(struct file *file,
.open = b43_debugfs_open, \
.read = b43_debugfs_read, \
.write = b43_debugfs_write, \
.llseek = generic_file_llseek, \
}, \
.file_struct_offset = offsetof(struct b43_dfsentry, \
file_##name), \
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/b43legacy/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ static ssize_t b43legacy_debugfs_write(struct file *file,
.open = b43legacy_debugfs_open, \
.read = b43legacy_debugfs_read, \
.write = b43legacy_debugfs_write, \
.llseek = generic_file_llseek, \
}, \
.file_struct_offset = offsetof(struct b43legacy_dfsentry, \
file_##name), \
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/wireless/iwlwifi/iwl-debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,15 @@ static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file)
static const struct file_operations iwl_dbgfs_##name##_ops = { \
.read = iwl_dbgfs_##name##_read, \
.open = iwl_dbgfs_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_WRITE_FILE_OPS(name) \
DEBUGFS_WRITE_FUNC(name); \
static const struct file_operations iwl_dbgfs_##name##_ops = { \
.write = iwl_dbgfs_##name##_write, \
.open = iwl_dbgfs_open_file_generic, \
.llseek = generic_file_llseek, \
};


Expand All @@ -104,6 +106,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = { \
.write = iwl_dbgfs_##name##_write, \
.read = iwl_dbgfs_##name##_read, \
.open = iwl_dbgfs_open_file_generic, \
.llseek = generic_file_llseek, \
};

static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/libertas/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,7 @@ static ssize_t lbs_wrrf_write(struct file *file,
.open = open_file_generic, \
.read = (fread), \
.write = (fwrite), \
.llseek = generic_file_llseek, \
}

struct lbs_debugfs_files {
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/rt2x00/rt2x00debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@ static const struct file_operations rt2x00debug_fop_##__name = {\
.write = rt2x00debug_write_##__name, \
.open = rt2x00debug_file_open, \
.release = rt2x00debug_file_release, \
.llseek = generic_file_llseek, \
};

RT2X00DEBUGFS_OPS(csr, "0x%.8x\n", u32);
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/wl12xx/wl1251_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \
static const struct file_operations name## _ops = { \
.read = name## _read, \
.open = wl1251_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_ADD(name, parent) \
Expand Down Expand Up @@ -86,6 +87,7 @@ static ssize_t sub## _ ##name## _read(struct file *file, \
static const struct file_operations sub## _ ##name## _ops = { \
.read = sub## _ ##name## _read, \
.open = wl1251_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_FWSTATS_ADD(sub, name) \
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/wl12xx/wl1271_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \
static const struct file_operations name## _ops = { \
.read = name## _read, \
.open = wl1271_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_ADD(name, parent) \
Expand Down Expand Up @@ -87,6 +88,7 @@ static ssize_t sub## _ ##name## _read(struct file *file, \
static const struct file_operations sub## _ ##name## _ops = { \
.read = sub## _ ##name## _read, \
.open = wl1271_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_FWSTATS_ADD(sub, name) \
Expand Down
2 changes: 2 additions & 0 deletions net/mac80211/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \
static const struct file_operations name## _ops = { \
.read = name## _read, \
.open = mac80211_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_ADD(name) \
Expand Down Expand Up @@ -346,6 +347,7 @@ static ssize_t stats_ ##name## _read(struct file *file, \
static const struct file_operations stats_ ##name## _ops = { \
.read = stats_ ##name## _read, \
.open = mac80211_open_file_generic, \
.llseek = generic_file_llseek, \
};

#define DEBUGFS_STATS_ADD(name, field) \
Expand Down
2 changes: 2 additions & 0 deletions net/mac80211/debugfs_key.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ static ssize_t key_##name##_read(struct file *file, \
static const struct file_operations key_ ##name## _ops = { \
.read = key_##name##_read, \
.open = mac80211_open_file_generic, \
.llseek = generic_file_llseek, \
}

#define KEY_FILE(name, format) \
Expand All @@ -46,6 +47,7 @@ static const struct file_operations key_ ##name## _ops = { \
static const struct file_operations key_ ##name## _ops = { \
.read = key_conf_##name##_read, \
.open = mac80211_open_file_generic, \
.llseek = generic_file_llseek, \
}

#define KEY_CONF_FILE(name, format) \
Expand Down
1 change: 1 addition & 0 deletions net/mac80211/debugfs_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ static const struct file_operations name##_ops = { \
.read = ieee80211_if_read_##name, \
.write = (_write), \
.open = mac80211_open_file_generic, \
.llseek = generic_file_llseek, \
}

#define __IEEE80211_IF_FILE_W(name) \
Expand Down
2 changes: 2 additions & 0 deletions net/mac80211/debugfs_sta.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ static ssize_t sta_ ##name## _read(struct file *file, \
static const struct file_operations sta_ ##name## _ops = { \
.read = sta_##name##_read, \
.open = mac80211_open_file_generic, \
.llseek = generic_file_llseek, \
}

#define STA_OPS_RW(name) \
static const struct file_operations sta_ ##name## _ops = { \
.read = sta_##name##_read, \
.write = sta_##name##_write, \
.open = mac80211_open_file_generic, \
.llseek = generic_file_llseek, \
}

#define STA_FILE(name, field, format) \
Expand Down
1 change: 1 addition & 0 deletions net/wireless/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf, \
static const struct file_operations name## _ops = { \
.read = name## _read, \
.open = cfg80211_open_file_generic, \
.llseek = generic_file_llseek, \
};

DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d",
Expand Down

0 comments on commit 2b18ab3

Please sign in to comment.