diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /net/netlink | |
parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/netlink_dev.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/net/netlink/netlink_dev.c b/net/netlink/netlink_dev.c index aa5bfc886..31b0bd890 100644 --- a/net/netlink/netlink_dev.c +++ b/net/netlink/netlink_dev.c @@ -166,16 +166,13 @@ static int netlink_ioctl(struct inode *inode, struct file *file, static struct file_operations netlink_fops = { - netlink_lseek, - netlink_read, - netlink_write, - NULL, /* netlink_readdir */ - netlink_poll, - netlink_ioctl, - NULL, /* netlink_mmap */ - netlink_open, - NULL, /* flush */ - netlink_release + llseek: netlink_lseek, + read: netlink_read, + write: netlink_write, + poll: netlink_poll, + ioctl: netlink_ioctl, + open: netlink_open, + release: netlink_release, }; int __init init_netlink(void) |