Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/net netsyms.c,1.1.1.2,1.2 socket.c,1.1.1.1,1.2 sysctl_net.c,1.1.1.2,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 16:29:07
|
Update of /cvsroot/linux-vax/kernel-2.4/net
In directory usw-pr-cvs1:/tmp/cvs-serv32481
Modified Files:
netsyms.c socket.c sysctl_net.c
Log Message:
synch 2.4.15 commit 21
Index: netsyms.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/netsyms.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- netsyms.c 25 Feb 2001 23:14:55 -0000 1.1.1.2
+++ netsyms.c 9 Apr 2002 16:29:01 -0000 1.2
@@ -30,6 +30,7 @@
#include <net/pkt_sched.h>
#include <net/scm.h>
#include <linux/if_bridge.h>
+#include <linux/if_vlan.h>
#include <linux/random.h>
#ifdef CONFIG_NET_DIVERT
#include <linux/divert.h>
@@ -61,6 +62,7 @@
#include <net/ipv6.h>
#include <net/ndisc.h>
#include <net/transp_v6.h>
+#include <net/addrconf.h>
extern int sysctl_local_port_range[2];
extern int tcp_port_rover;
@@ -130,15 +132,28 @@
EXPORT_SYMBOL(sock_no_sendmsg);
EXPORT_SYMBOL(sock_no_recvmsg);
EXPORT_SYMBOL(sock_no_mmap);
+EXPORT_SYMBOL(sock_no_sendpage);
EXPORT_SYMBOL(sock_rfree);
EXPORT_SYMBOL(sock_wfree);
EXPORT_SYMBOL(sock_wmalloc);
EXPORT_SYMBOL(sock_rmalloc);
+EXPORT_SYMBOL(skb_linearize);
+EXPORT_SYMBOL(skb_checksum);
+EXPORT_SYMBOL(skb_checksum_help);
EXPORT_SYMBOL(skb_recv_datagram);
EXPORT_SYMBOL(skb_free_datagram);
EXPORT_SYMBOL(skb_copy_datagram);
EXPORT_SYMBOL(skb_copy_datagram_iovec);
+EXPORT_SYMBOL(skb_copy_and_csum_datagram_iovec);
+EXPORT_SYMBOL(skb_copy_bits);
+EXPORT_SYMBOL(skb_copy_and_csum_bits);
+EXPORT_SYMBOL(skb_copy_and_csum_dev);
EXPORT_SYMBOL(skb_copy_expand);
+EXPORT_SYMBOL(___pskb_trim);
+EXPORT_SYMBOL(__pskb_pull_tail);
+EXPORT_SYMBOL(pskb_expand_head);
+EXPORT_SYMBOL(pskb_copy);
+EXPORT_SYMBOL(skb_realloc_headroom);
EXPORT_SYMBOL(datagram_poll);
EXPORT_SYMBOL(put_cmsg);
EXPORT_SYMBOL(sock_kmalloc);
@@ -146,6 +161,7 @@
#ifdef CONFIG_FILTER
EXPORT_SYMBOL(sk_run_filter);
+EXPORT_SYMBOL(sk_chk_filter);
#endif
EXPORT_SYMBOL(neigh_table_init);
@@ -190,7 +206,6 @@
EXPORT_SYMBOL(scm_fp_dup);
EXPORT_SYMBOL(files_stat);
EXPORT_SYMBOL(memcpy_toiovec);
-EXPORT_SYMBOL(csum_partial);
#ifdef CONFIG_IPX_MODULE
EXPORT_SYMBOL(make_8023_client);
@@ -199,6 +214,12 @@
EXPORT_SYMBOL(destroy_EII_client);
#endif
+/* for 801q VLAN support */
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+EXPORT_SYMBOL(dev_change_flags);
+EXPORT_SYMBOL(vlan_ioctl_hook);
+#endif
+
EXPORT_SYMBOL(sklist_destroy_socket);
EXPORT_SYMBOL(sklist_insert_socket);
@@ -222,10 +243,11 @@
EXPORT_SYMBOL(inetdev_lock);
EXPORT_SYMBOL(inet_add_protocol);
EXPORT_SYMBOL(inet_del_protocol);
+EXPORT_SYMBOL(inet_register_protosw);
+EXPORT_SYMBOL(inet_unregister_protosw);
EXPORT_SYMBOL(ip_route_output_key);
EXPORT_SYMBOL(ip_route_input);
EXPORT_SYMBOL(icmp_send);
-EXPORT_SYMBOL(icmp_reply);
EXPORT_SYMBOL(ip_options_compile);
EXPORT_SYMBOL(ip_options_undo);
EXPORT_SYMBOL(arp_send);
@@ -238,6 +260,7 @@
EXPORT_SYMBOL(ip_mc_inc_group);
EXPORT_SYMBOL(ip_mc_dec_group);
EXPORT_SYMBOL(ip_finish_output);
+EXPORT_SYMBOL(inet_stream_ops);
EXPORT_SYMBOL(inet_dgram_ops);
EXPORT_SYMBOL(ip_cmsg_recv);
EXPORT_SYMBOL(inet_addr_type);
@@ -265,10 +288,12 @@
#ifdef CONFIG_IPV6
EXPORT_SYMBOL(ipv6_addr_type);
EXPORT_SYMBOL(icmpv6_send);
+EXPORT_SYMBOL(ndisc_mc_map);
+EXPORT_SYMBOL(register_inet6addr_notifier);
+EXPORT_SYMBOL(unregister_inet6addr_notifier);
#endif
#if defined (CONFIG_IPV6_MODULE) || defined (CONFIG_KHTTPD) || defined (CONFIG_KHTTPD_MODULE)
/* inet functions common to v4 and v6 */
-EXPORT_SYMBOL(inet_stream_ops);
EXPORT_SYMBOL(inet_release);
EXPORT_SYMBOL(inet_stream_connect);
EXPORT_SYMBOL(inet_dgram_connect);
@@ -295,7 +320,6 @@
EXPORT_SYMBOL(ip_queue_xmit);
EXPORT_SYMBOL(memcpy_fromiovecend);
EXPORT_SYMBOL(csum_partial_copy_fromiovecend);
-EXPORT_SYMBOL(copy_and_csum_toiovec);
EXPORT_SYMBOL(tcp_v4_lookup_listener);
/* UDP/TCP exported functions for TCPv6 */
EXPORT_SYMBOL(udp_ioctl);
@@ -362,8 +386,7 @@
EXPORT_SYMBOL(sysctl_tcp_wmem);
EXPORT_SYMBOL(sysctl_tcp_ecn);
EXPORT_SYMBOL(tcp_cwnd_application_limited);
-
-EXPORT_SYMBOL(xrlim_allow);
+EXPORT_SYMBOL(tcp_sendpage);
EXPORT_SYMBOL(tcp_write_xmit);
@@ -416,6 +439,9 @@
EXPORT_SYMBOL(rtnl_lock);
EXPORT_SYMBOL(rtnl_unlock);
+/* ABI emulation layers need this */
+EXPORT_SYMBOL(move_addr_to_kernel);
+EXPORT_SYMBOL(move_addr_to_user);
/* Used by at least ipip.c. */
EXPORT_SYMBOL(ipv4_config);
@@ -423,6 +449,7 @@
/* Used by other modules */
EXPORT_SYMBOL(in_ntoa);
+EXPORT_SYMBOL(xrlim_allow);
EXPORT_SYMBOL(ip_rcv);
EXPORT_SYMBOL(arp_rcv);
@@ -432,17 +459,7 @@
#endif /* CONFIG_INET */
#ifdef CONFIG_TR
-EXPORT_SYMBOL(tr_setup);
EXPORT_SYMBOL(tr_type_trans);
-EXPORT_SYMBOL(register_trdev);
-EXPORT_SYMBOL(unregister_trdev);
-EXPORT_SYMBOL(init_trdev);
-#endif
-
-#ifdef CONFIG_NET_FC
-EXPORT_SYMBOL(register_fcdev);
-EXPORT_SYMBOL(unregister_fcdev);
-EXPORT_SYMBOL(init_fcdev);
#endif
/* Device callback registration */
@@ -451,14 +468,10 @@
/* support for loadable net drivers */
#ifdef CONFIG_NET
-EXPORT_SYMBOL(init_etherdev);
EXPORT_SYMBOL(loopback_dev);
EXPORT_SYMBOL(register_netdevice);
EXPORT_SYMBOL(unregister_netdevice);
-EXPORT_SYMBOL(register_netdev);
-EXPORT_SYMBOL(unregister_netdev);
EXPORT_SYMBOL(netdev_state_change);
-EXPORT_SYMBOL(ether_setup);
EXPORT_SYMBOL(dev_new_index);
EXPORT_SYMBOL(dev_get_by_index);
EXPORT_SYMBOL(__dev_get_by_index);
@@ -469,8 +482,6 @@
EXPORT_SYMBOL(eth_type_trans);
#ifdef CONFIG_FDDI
EXPORT_SYMBOL(fddi_type_trans);
-EXPORT_SYMBOL(fddi_setup);
-EXPORT_SYMBOL(init_fddidev);
#endif /* CONFIG_FDDI */
#if 0
EXPORT_SYMBOL(eth_copy_and_sum);
@@ -503,16 +514,12 @@
EXPORT_SYMBOL(dev_mc_add);
EXPORT_SYMBOL(dev_mc_delete);
EXPORT_SYMBOL(dev_mc_upload);
-EXPORT_SYMBOL(n_tty_ioctl);
-EXPORT_SYMBOL(tty_register_ldisc);
EXPORT_SYMBOL(__kill_fasync);
EXPORT_SYMBOL(if_port_text);
#ifdef CONFIG_HIPPI
EXPORT_SYMBOL(hippi_type_trans);
-EXPORT_SYMBOL(init_hippi_dev);
-EXPORT_SYMBOL(unregister_hipdev);
#endif
#ifdef CONFIG_SYSCTL
@@ -523,12 +530,6 @@
#endif
#endif
-#if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE)
-#include<linux/if_ltalk.h>
-EXPORT_SYMBOL(ltalk_setup);
-#endif
-
-
/* Packet scheduler modules want these. */
EXPORT_SYMBOL(qdisc_destroy);
EXPORT_SYMBOL(qdisc_reset);
@@ -574,6 +575,7 @@
EXPORT_SYMBOL(nf_hooks);
EXPORT_SYMBOL(nf_setsockopt);
EXPORT_SYMBOL(nf_getsockopt);
+EXPORT_SYMBOL(ip_ct_attach);
#endif
EXPORT_SYMBOL(register_gifconf);
Index: socket.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/socket.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- socket.c 14 Jan 2001 17:06:56 -0000 1.1.1.1
+++ socket.c 9 Apr 2002 16:29:01 -0000 1.2
@@ -71,6 +71,7 @@
#include <linux/poll.h>
#include <linux/cache.h>
#include <linux/module.h>
+#include <linux/highmem.h>
#if defined(CONFIG_KMOD) && defined(CONFIG_NET)
#include <linux/kmod.h>
@@ -104,6 +105,8 @@
unsigned long count, loff_t *ppos);
static ssize_t sock_writev(struct file *file, const struct iovec *vector,
unsigned long count, loff_t *ppos);
+static ssize_t sock_sendpage(struct file *file, struct page *page,
+ int offset, size_t size, loff_t *ppos, int more);
/*
@@ -122,7 +125,8 @@
release: sock_close,
fasync: sock_fasync,
readv: sock_readv,
- writev: sock_writev
+ writev: sock_writev,
+ sendpage: sock_sendpage
};
/*
@@ -299,8 +303,7 @@
}
static struct vfsmount *sock_mnt;
-static DECLARE_FSTYPE(sock_fs_type, "sockfs", sockfs_read_super,
- FS_NOMOUNT|FS_SINGLE);
+static DECLARE_FSTYPE(sock_fs_type, "sockfs", sockfs_read_super, FS_NOMOUNT);
static int sockfs_delete_dentry(struct dentry *dentry)
{
return 1;
@@ -602,6 +605,24 @@
return sock_sendmsg(sock, &msg, size);
}
+ssize_t sock_sendpage(struct file *file, struct page *page,
+ int offset, size_t size, loff_t *ppos, int more)
+{
+ struct socket *sock;
+ int flags;
+
+ if (ppos != &file->f_pos)
+ return -ESPIPE;
+
+ sock = socki_lookup(file->f_dentry->d_inode);
+
+ flags = !(file->f_flags & O_NONBLOCK) ? 0 : MSG_DONTWAIT;
+ if (more)
+ flags |= MSG_MORE;
+
+ return sock->ops->sendpage(sock, page, offset, size, flags);
+}
+
int sock_readv_writev(int type, struct inode * inode, struct file * file,
const struct iovec * iov, long count, long size)
{
@@ -819,8 +840,10 @@
/*
* Check protocol is in range
*/
- if(family<0 || family>=NPROTO)
+ if (family < 0 || family >= NPROTO)
return -EAFNOSUPPORT;
+ if (type < 0 || type >= SOCK_MAX)
+ return -EINVAL;
/* Compatibility.
@@ -1181,13 +1204,14 @@
msg.msg_iovlen=1;
msg.msg_control=NULL;
msg.msg_controllen=0;
- msg.msg_namelen=addr_len;
+ msg.msg_namelen=0;
if(addr)
{
err = move_addr_to_kernel(addr, addr_len, address);
if (err < 0)
goto out_put;
msg.msg_name=address;
+ msg.msg_namelen=addr_len;
}
if (sock->file->f_flags & O_NONBLOCK)
flags |= MSG_DONTWAIT;
@@ -1269,7 +1293,10 @@
{
int err;
struct socket *sock;
-
+
+ if (optlen < 0)
+ return -EINVAL;
+
if ((sock = sockfd_lookup(fd, &err))!=NULL)
{
if (level == SOL_SOCKET)
@@ -1643,6 +1670,10 @@
extern void wanrouter_init(void);
#endif
+#ifdef CONFIG_BLUEZ
+extern void bluez_init(void);
+#endif
+
void __init sock_init(void)
{
int i;
@@ -1701,6 +1732,10 @@
#endif
#ifdef CONFIG_NETFILTER
netfilter_init();
+#endif
+
+#ifdef CONFIG_BLUEZ
+ bluez_init();
#endif
}
Index: sysctl_net.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/sysctl_net.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- sysctl_net.c 25 Feb 2001 23:14:55 -0000 1.1.1.2
+++ sysctl_net.c 9 Apr 2002 16:29:01 -0000 1.2
@@ -5,8 +5,8 @@
* Added /proc/sys/net directories for each protocol family. [MS]
*
* $Log$
- * Revision 1.1.1.2 2001/02/25 23:14:55 kenn
- * Import official 2.4.2 Linus tree
+ * Revision 1.2 2002/04/09 16:29:01 atp
+ * synch 2.4.15 commit 21
*
* Revision 1.2 1996/05/08 20:24:40 shaver
* Added bits for NET_BRIDGE and the NET_IPV4_ARP stuff and
@@ -23,10 +23,6 @@
extern ctl_table ipv4_table[];
#endif
-#ifdef CONFIG_IPX
-extern ctl_table ipx_table[];
-#endif
-
extern ctl_table core_table[];
#ifdef CONFIG_NET
@@ -41,10 +37,6 @@
extern ctl_table tr_table[];
#endif
-#ifdef CONFIG_ECONET
-extern ctl_table econet_table[];
-#endif
-
ctl_table net_table[] = {
{NET_CORE, "core", NULL, 0, 0555, core_table},
#ifdef CONFIG_NET
@@ -54,17 +46,11 @@
#ifdef CONFIG_INET
{NET_IPV4, "ipv4", NULL, 0, 0555, ipv4_table},
#endif
-#ifdef CONFIG_IPX
- {NET_IPX, "ipx", NULL, 0, 0555, ipx_table},
-#endif
#ifdef CONFIG_IPV6
{NET_IPV6, "ipv6", NULL, 0, 0555, ipv6_table},
#endif
#ifdef CONFIG_TR
{NET_TR, "token-ring", NULL, 0, 0555, tr_table},
-#endif
-#ifdef CONFIG_ECONET
- {NET_ECONET, "econet", NULL, 0, 0555, econet_table},
#endif
{0}
};
|
