patch-2.4.4 linux/net/econet/af_econet.c
Next file: linux/net/econet/sysctl_net_ec.c
Previous file: linux/net/econet/Makefile
Back to the patch index
Back to the overall index
- Lines: 113
- Date:
Thu Apr 19 08:38:50 2001
- Orig file:
v2.4.3/linux/net/econet/af_econet.c
- Orig date:
Mon Oct 16 12:42:54 2000
diff -u --recursive --new-file v2.4.3/linux/net/econet/af_econet.c linux/net/econet/af_econet.c
@@ -297,7 +297,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 +410,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;
@@ -695,8 +695,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 +717,7 @@
sendmsg: econet_sendmsg,
recvmsg: econet_recvmsg,
mmap: sock_no_mmap,
+ sendpage: sock_no_sendpage,
};
#include <linux/smp_lock.h>
@@ -726,7 +727,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 +1065,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 +1100,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 +1113,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 +1126,6 @@
econet_hw_initialise();
#endif
register_netdevice_notifier(&econet_netdev_notifier);
-#ifdef CONFIG_SYSCTL
- econet_sysctl_register();
-#endif
return 0;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)