diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-06-04 16:00:32 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-06-04 16:00:32 -0300 |
| commit | 63413da5d31d99ba8d89cf9d9ff997f93b49443d (patch) | |
| tree | 4add196b24e554f140663a7bd92260a7fd9ebdc4 /drivers/net/pppox.c | |
| parent | fbf47415732b00ff5578d55c6be779a109a01e1f (diff) | |
o net: create struct sock_common and use in struct sock & tcp_tw_bucket
With this the data dependency is reduced to just making sure that the first
member of both struct sock and struct tcp_tw_bucket are a struct sock_common.
Also makes it easier to grep for struct sock and struct tcp_tw_bucket usage in
the tree as all the members in those structs are prefixed, respectively, with
sk_ and tw_, like struct inode (i_), struct block_device (bd_), etc.
Checked namespace with make tags/ctags, just one colision with the macros for
the struct sock members, with a wanrouter struct, fixed that
s/sk_state/state_sk/g in the wanrouter struct.
Checked as well if the names of the members in both structs collided with some
macro, none found.
Diffstat (limited to 'drivers/net/pppox.c')
| -rw-r--r-- | drivers/net/pppox.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c index a5633d50c35a..9a29158473d8 100644 --- a/drivers/net/pppox.c +++ b/drivers/net/pppox.c @@ -58,9 +58,9 @@ void pppox_unbind_sock(struct sock *sk) { /* Clear connection to ppp device, if attached. */ - if (sk->state & (PPPOX_BOUND|PPPOX_ZOMBIE)) { + if (sk->sk_state & (PPPOX_BOUND | PPPOX_ZOMBIE)) { ppp_unregister_channel(&pppox_sk(sk)->chan); - sk->state = PPPOX_DEAD; + sk->sk_state = PPPOX_DEAD; } } @@ -81,7 +81,7 @@ static int pppox_ioctl(struct socket* sock, unsigned int cmd, case PPPIOCGCHAN: { int index; rc = -ENOTCONN; - if (!(sk->state & PPPOX_CONNECTED)) + if (!(sk->sk_state & PPPOX_CONNECTED)) break; rc = -EINVAL; @@ -90,12 +90,13 @@ static int pppox_ioctl(struct socket* sock, unsigned int cmd, break; rc = 0; - sk->state |= PPPOX_BOUND; + sk->sk_state |= PPPOX_BOUND; break; } default: - if (pppox_protos[sk->protocol]->ioctl) - rc = pppox_protos[sk->protocol]->ioctl(sock, cmd, arg); + if (pppox_protos[sk->sk_protocol]->ioctl) + rc = pppox_protos[sk->sk_protocol]->ioctl(sock, cmd, + arg); break; }; |