Messages in this thread Patch in this message | | | Subject | [PATCH][2.5] compile fixes for recent changes to include/net/sock.h | From | Martin Schlemmer <> | Date | 07 Jun 2003 19:30:25 +0200 |
| |
Hi
This fixes compile failures due to recent changes in include/net/sock.h. Seems like a lot of struct sock's members had a 'sk_' appended, but changes to following was missed:
drivers/net/ethertap.c fs/smbfs/sock.c fs/smbfs/proc.c
If any queries, please also CC me at <fgs at lantic.net>, as current mail offline until monday.
Regards,
--
Martin Schlemmer
diff -urpN linux-2.5.70bk12/drivers/net/ethertap.c linux-2.5.70bk12.sock_fixes/drivers/net/ethertap.c --- linux-2.5.70bk12/drivers/net/ethertap.c 2003-05-27 03:00:26.000000000 +0200 +++ linux-2.5.70bk12.sock_fixes/drivers/net/ethertap.c 2003-06-07 19:23:43.000000000 +0200 @@ -292,19 +292,19 @@ static __inline__ int ethertap_rx_skb(st static void ethertap_rx(struct sock *sk, int len) { - struct net_device *dev = tap_map[sk->protocol]; + struct net_device *dev = tap_map[sk->sk_protocol]; struct sk_buff *skb; if (dev==NULL) { printk(KERN_CRIT "ethertap: bad unit!\n"); - skb_queue_purge(&sk->receive_queue); + skb_queue_purge(&sk->sk_receive_queue); return; } if (ethertap_debug > 3) printk("%s: ethertap_rx()\n", dev->name); - while ((skb = skb_dequeue(&sk->receive_queue)) != NULL) + while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) ethertap_rx_skb(skb, dev); } @@ -320,7 +320,7 @@ static int ethertap_close(struct net_dev if (sk) { lp->nl = NULL; - sock_release(sk->socket); + sock_release(sk->sk_socket); } return 0; diff -urpN linux-2.5.70bk12/fs/smbfs/proc.c linux-2.5.70bk12.sock_fixes/fs/smbfs/proc.c --- linux-2.5.70bk12/fs/smbfs/proc.c 2003-05-27 03:00:24.000000000 +0200 +++ linux-2.5.70bk12.sock_fixes/fs/smbfs/proc.c 2003-06-07 19:24:05.000000000 +0200 @@ -900,10 +900,10 @@ smb_newconn(struct smb_sb_info *server, * Store the server in sock user_data (Only used by sunrpc) */ sk = SOCKET_I(filp->f_dentry->d_inode)->sk; - sk->user_data = server; + sk->sk_user_data = server; /* chain into the data_ready callback */ - server->data_ready = xchg(&sk->data_ready, smb_data_ready); + server->data_ready = xchg(&sk->sk_data_ready, smb_data_ready); /* check if we have an old smbmount that uses seconds for the serverzone */ diff -urpN linux-2.5.70bk12/fs/smbfs/sock.c linux-2.5.70bk12.sock_fixes/fs/smbfs/sock.c --- linux-2.5.70bk12/fs/smbfs/sock.c 2003-05-27 03:00:38.000000000 +0200 +++ linux-2.5.70bk12.sock_fixes/fs/smbfs/sock.c 2003-06-07 19:23:56.000000000 +0200 @@ -68,7 +68,7 @@ _recvfrom(struct socket *socket, unsigne static struct smb_sb_info * server_from_socket(struct socket *socket) { - return socket->sk->user_data; + return socket->sk->sk_user_data; } /* @@ -77,7 +77,7 @@ server_from_socket(struct socket *socket void smb_data_ready(struct sock *sk, int len) { - struct smb_sb_info *server = server_from_socket(sk->socket); + struct smb_sb_info *server = server_from_socket(sk->sk_socket); void (*data_ready)(struct sock *, int) = server->data_ready; data_ready(sk, len); @@ -117,7 +117,7 @@ smb_close_socket(struct smb_sb_info *ser struct socket *sock = server_sock(server); VERBOSE("closing socket %p\n", sock); - sock->sk->data_ready = server->data_ready; + sock->sk->sk_data_ready = server->data_ready; server->sock_file = NULL; fput(file); } @@ -226,7 +226,7 @@ smb_receive_header(struct smb_sb_info *s sock = server_sock(server); if (!sock) goto out; - if (sock->sk->state != TCP_ESTABLISHED) + if (sock->sk->sk_state != TCP_ESTABLISHED) goto out; if (!server->smb_read) { @@ -290,7 +290,7 @@ smb_receive_drop(struct smb_sb_info *ser sock = server_sock(server); if (!sock) goto out; - if (sock->sk->state != TCP_ESTABLISHED) + if (sock->sk->sk_state != TCP_ESTABLISHED) goto out; fs = get_fs(); @@ -345,7 +345,7 @@ smb_receive(struct smb_sb_info *server, sock = server_sock(server); if (!sock) goto out; - if (sock->sk->state != TCP_ESTABLISHED) + if (sock->sk->sk_state != TCP_ESTABLISHED) goto out; fs = get_fs(); @@ -400,7 +400,7 @@ smb_send_request(struct smb_request *req sock = server_sock(server); if (!sock) goto out; - if (sock->sk->state != TCP_ESTABLISHED) + if (sock->sk->sk_state != TCP_ESTABLISHED) goto out; msg.msg_name = NULL;[unhandled content-type:application/pgp-signature] | |