Update of /cvsroot/linux-vax/kernel-2.4/net/econet
In directory usw-pr-cvs1:/tmp/cvs-serv30993/econet
Modified Files:
Makefile af_econet.c
Removed Files:
sysctl_net_ec.c
Log Message:
synch 2.4.15 commit 19
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/econet/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 17:13:12 -0000 1.1.1.1
+++ Makefile 9 Apr 2002 16:22:03 -0000 1.2
@@ -9,7 +9,8 @@
O_TARGET := econet.o
-obj-y := af_econet.o sysctl_net_ec.o
+obj-y := af_econet.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
+
Index: af_econet.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/econet/af_econet.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- af_econet.c 14 Jan 2001 17:13:15 -0000 1.1.1.1
+++ af_econet.c 9 Apr 2002 16:22:03 -0000 1.2
@@ -68,7 +68,7 @@
unsigned long handle;
};
-static unsigned long aun_seq = 0;
+static unsigned long aun_seq;
/* Queue of packets waiting to be transmitted. */
static struct sk_buff_head aun_queue;
@@ -172,9 +172,8 @@
* Check legality
*/
- if (addr_len < sizeof(struct sockaddr_ec))
- return -EINVAL;
- if (sec->sec_family != AF_ECONET)
+ if (addr_len < sizeof(struct sockaddr_ec) ||
+ sec->sec_family != AF_ECONET)
return -EINVAL;
sk->protinfo.af_econet->cb = sec->cb;
@@ -297,7 +296,7 @@
#ifdef CONFIG_ECONET_NATIVE
atomic_inc(&dev->refcnt);
- skb = sock_alloc_send_skb(sk, len+dev->hard_header_len+15, 0,
+ skb = sock_alloc_send_skb(sk, len+dev->hard_header_len+15,
msg->msg_flags & MSG_DONTWAIT, &err);
if (skb==NULL)
goto out_unlock;
@@ -410,7 +409,7 @@
}
/* Get a skbuff (no data, just holds our cb information) */
- if ((skb = sock_alloc_send_skb(sk, 0, 0,
+ if ((skb = sock_alloc_send_skb(sk, 0,
msg->msg_flags & MSG_DONTWAIT, &err)) == NULL)
return err;
@@ -485,7 +484,6 @@
static int econet_release(struct socket *sock)
{
- struct sk_buff *skb;
struct sock *sk = sock->sk;
if (!sk)
@@ -505,8 +503,7 @@
/* Purge queues */
- while ((skb=skb_dequeue(&sk->receive_queue))!=NULL)
- kfree_skb(skb);
+ skb_queue_purge(&sk->receive_queue);
if (atomic_read(&sk->rmem_alloc) || atomic_read(&sk->wmem_alloc)) {
sk->timer.data=(unsigned long)sk;
@@ -695,8 +692,8 @@
}
static struct net_proto_family econet_family_ops = {
- PF_ECONET,
- econet_create
+ family: PF_ECONET,
+ create: econet_create,
};
static struct proto_ops SOCKOPS_WRAPPED(econet_ops) = {
@@ -717,6 +714,7 @@
sendmsg: econet_sendmsg,
recvmsg: econet_recvmsg,
mmap: sock_no_mmap,
+ sendpage: sock_no_sendpage,
};
#include <linux/smp_lock.h>
@@ -726,7 +724,7 @@
* Find the listening socket, if any, for the given data.
*/
-struct sock *ec_listening_socket(unsigned char port, unsigned char
+static struct sock *ec_listening_socket(unsigned char port, unsigned char
station, unsigned char net)
{
struct sock *sk = econet_sklist;
@@ -1064,18 +1062,13 @@
hdr->port);
}
-struct packet_type econet_packet_type=
-{
- 0,
- NULL,
- econet_rcv,
- NULL,
- NULL
+static struct packet_type econet_packet_type = {
+ type: __constant_htons(ETH_P_ECONET),
+ func: econet_rcv,
};
static void econet_hw_initialise(void)
{
- econet_packet_type.type = htons(ETH_P_ECONET);
dev_add_pack(&econet_packet_type);
}
@@ -1104,15 +1097,12 @@
return NOTIFY_DONE;
}
-struct notifier_block econet_netdev_notifier={
- econet_notifier,
- NULL,
- 0
+static struct notifier_block econet_netdev_notifier = {
+ notifier_call: econet_notifier,
};
-void __exit econet_proto_exit(void)
+static void __exit econet_proto_exit(void)
{
- extern void econet_sysctl_unregister(void);
#ifdef CONFIG_ECONET_AUNUDP
del_timer(&ab_cleanup_timer);
if (udpsock)
@@ -1120,14 +1110,10 @@
#endif
unregister_netdevice_notifier(&econet_netdev_notifier);
sock_unregister(econet_family_ops.family);
-#ifdef CONFIG_SYSCTL
- econet_sysctl_unregister();
-#endif
}
-int __init econet_proto_init(void)
+static int __init econet_proto_init(void)
{
- extern void econet_sysctl_register(void);
sock_register(&econet_family_ops);
#ifdef CONFIG_ECONET_AUNUDP
spin_lock_init(&aun_queue_lock);
@@ -1137,9 +1123,6 @@
econet_hw_initialise();
#endif
register_netdevice_notifier(&econet_netdev_notifier);
-#ifdef CONFIG_SYSCTL
- econet_sysctl_register();
-#endif
return 0;
}
--- sysctl_net_ec.c DELETED ---
|
