diff options
| author | Thomas Graf <tgraf@suug.ch> | 2005-03-16 01:50:36 +0100 |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2005-03-16 01:50:36 +0100 |
| commit | 3ad701b91f476c14cd094ed0874b68fac0f16e5e (patch) | |
| tree | 3b9f154056f55313816a6000dba44939e30f1191 /net/decnet | |
| parent | 553f516cd094a964772541b159e1ca07b2faa9d1 (diff) | |
[NET] Convert sk_zapped into SOCK_ZAPPED flag
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
| -rw-r--r-- | net/decnet/af_decnet.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 431378d2eb36..5bb14d055095 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -750,14 +750,13 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) rv = -EINVAL; lock_sock(sk); - if (sk->sk_zapped) { + if (sock_flag(sk, SOCK_ZAPPED)) { memcpy(&scp->addr, saddr, addr_len); - sk->sk_zapped = 0; + sock_reset_flag(sk, SOCK_ZAPPED); rv = dn_hash_sock(sk); - if (rv) { - sk->sk_zapped = 1; - } + if (rv) + sock_set_flag(sk, SOCK_ZAPPED); } release_sock(sk); @@ -771,7 +770,7 @@ static int dn_auto_bind(struct socket *sock) struct dn_scp *scp = DN_SK(sk); int rv; - sk->sk_zapped = 0; + sock_reset_flag(sk, SOCK_ZAPPED); scp->addr.sdn_flags = 0; scp->addr.sdn_objnum = 0; @@ -795,9 +794,8 @@ static int dn_auto_bind(struct socket *sock) rv = dn_dev_bind_default((dn_address *)scp->addr.sdn_add.a_addr); if (rv == 0) { rv = dn_hash_sock(sk); - if (rv) { - sk->sk_zapped = 1; - } + if (rv) + sock_set_flag(sk, SOCK_ZAPPED); } return rv; @@ -922,7 +920,7 @@ static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen, if (addr->sdn_flags & SDF_WILD) goto out; - if (sk->sk_zapped) { + if (sock_flag(sk, SOCK_ZAPPED)) { err = dn_auto_bind(sk->sk_socket); if (err) goto out; @@ -1141,7 +1139,7 @@ static int dn_accept(struct socket *sock, struct socket *newsock, int flags) lock_sock(newsk); err = dn_hash_sock(newsk); if (err == 0) { - newsk->sk_zapped = 0; + sock_reset_flag(newsk, SOCK_ZAPPED); dn_send_conn_ack(newsk); /* @@ -1259,7 +1257,7 @@ static int dn_listen(struct socket *sock, int backlog) lock_sock(sk); - if (sk->sk_zapped) + if (sock_flag(sk, SOCK_ZAPPED)) goto out; if ((DN_SK(sk)->state != DN_O) || (sk->sk_state == TCP_LISTEN)) @@ -1671,7 +1669,7 @@ static int dn_recvmsg(struct kiocb *iocb, struct socket *sock, lock_sock(sk); - if (sk->sk_zapped) { + if (sock_flag(sk, SOCK_ZAPPED)) { rv = -EADDRNOTAVAIL; goto out; } |