diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 23:29:35 +0000 |
| commit | 35385d7a83b4cae6d5ea5f80f3b3377d94178344 (patch) | |
| tree | 49494d95dfef31ba4f9a697d31e4028cf65a57bd /net | |
| parent | d9d8062e7b49943b2a2fb034f817a9fc217fd40f (diff) | |
Merge with 2.4.0-test3-pre7.
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/mpoa_proc.c | 1 | ||||
| -rw-r--r-- | net/atm/proc.c | 4 | ||||
| -rw-r--r-- | net/netsyms.c | 16 | ||||
| -rw-r--r-- | net/socket.c | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index bb6eddfe6..69d8b726d 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c @@ -324,6 +324,7 @@ int mpc_proc_init(void) return -ENOMEM; } p->proc_fops = &mpc_file_operations; + p->owner = THIS_MODULE; return 0; } diff --git a/net/atm/proc.c b/net/atm/proc.c index b2b186ac4..4a016d08b 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c @@ -559,6 +559,7 @@ int atm_proc_dev_register(struct atm_dev *dev) goto fail0; dev->proc_entry->data = dev; dev->proc_entry->proc_fops = &proc_dev_atm_operations; + dev->proc_entry->owner = THIS_MODULE; return 0; kfree(dev->proc_entry); fail0: @@ -579,7 +580,8 @@ void atm_proc_dev_deregister(struct atm_dev *dev) name = create_proc_entry(#name,0,atm_proc_root); \ if (!name) goto cleanup; \ name->data = atm_##name##_info; \ - name->proc_fops = &proc_spec_atm_operations + name->proc_fops = &proc_spec_atm_operations; \ + name->owner = THIS_MODULE int __init atm_proc_init(void) diff --git a/net/netsyms.c b/net/netsyms.c index cd4a2bdb9..e1bfc3403 100644 --- a/net/netsyms.c +++ b/net/netsyms.c @@ -436,22 +436,6 @@ EXPORT_SYMBOL(arp_find); #endif /* CONFIG_INET */ -#if defined(CONFIG_ULTRA) || defined(CONFIG_WD80x3) || \ - defined(CONFIG_EL2) || defined(CONFIG_NE2000) || \ - defined(CONFIG_E2100) || defined(CONFIG_HPLAN_PLUS) || \ - defined(CONFIG_HPLAN) || defined(CONFIG_AC3200) || \ - defined(CONFIG_ES3210) || defined(CONFIG_ULTRA32) || \ - defined(CONFIG_LNE390) || defined(CONFIG_NE3210) || \ - defined(CONFIG_NE2K_PCI) || defined(CONFIG_APNE) || \ - defined(CONFIG_DAYNAPORT) -/* If 8390 NIC support is built in, we will need these. */ -EXPORT_SYMBOL(ei_open); -EXPORT_SYMBOL(ei_close); -EXPORT_SYMBOL(ei_interrupt); -EXPORT_SYMBOL(ethdev_init); -EXPORT_SYMBOL(NS8390_init); -#endif - #ifdef CONFIG_TR EXPORT_SYMBOL(tr_setup); EXPORT_SYMBOL(tr_type_trans); diff --git a/net/socket.c b/net/socket.c index 276940470..4cd725731 100644 --- a/net/socket.c +++ b/net/socket.c @@ -365,7 +365,7 @@ static int sock_map_fd(struct socket *sock) file->f_vfsmnt = mntget(sock_mnt); sock->file = file; - file->f_op = &socket_file_ops; + file->f_op = sock->inode->i_fop = &socket_file_ops; file->f_mode = 3; file->f_flags = O_RDWR; file->f_pos = 0; |