diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /net/rose | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 494b9fa62..1c17b3648 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -149,7 +149,7 @@ static struct sock *rose_alloc_sock(void) struct sock *sk; rose_cb *rose; - if ((sk = sk_alloc(AF_ROSE, GFP_ATOMIC, 1)) == NULL) + if ((sk = sk_alloc(PF_ROSE, GFP_ATOMIC, 1)) == NULL) return NULL; if ((rose = kmalloc(sizeof(*rose), GFP_ATOMIC)) == NULL) { @@ -1320,12 +1320,12 @@ static int rose_get_info(char *buffer, char **start, off_t offset, int length, i } static struct net_proto_family rose_family_ops = { - AF_ROSE, + PF_ROSE, rose_create }; static struct proto_ops rose_proto_ops = { - AF_ROSE, + PF_ROSE, sock_no_dup, rose_release, @@ -1462,7 +1462,7 @@ void cleanup_module(void) #endif unregister_netdevice_notifier(&rose_dev_notifier); - sock_unregister(AF_ROSE); + sock_unregister(PF_ROSE); for (i = 0; i < rose_ndevs; i++) { if (dev_rose[i].priv != NULL) { |