patch-2.1.89 linux/include/net/sock.h

• Lines: 67
• Date: Fri Mar 6 21:03:13 1998
• Orig file: v2.1.88/linux/include/net/sock.h
• Orig date: Fri Feb 6 15:33:35 1998

diff -u --recursive --new-file v2.1.88/linux/include/net/sock.h linux/include/net/sock.h
@@ -148,10 +148,10 @@
 	struct in6_addr		daddr;
 
 	__u32			flow_lbl;
+	int			hop_limit;
+	int			mcast_hops;
 	__u8			priority;
-	__u8			hop_limit;
 
-	__u8			mcast_hops;
 
 	/* sockopt flags */
 
@@ -572,7 +572,7 @@
 	void			(*write_wakeup)(struct sock *sk);
 	void			(*read_wakeup)(struct sock *sk);
 
-	unsigned int		(*poll)(struct socket *sock,
+	unsigned int		(*poll)(struct file * file, struct socket *sock,
 					struct poll_table_struct *wait);
 
 	int			(*ioctl)(struct sock *sk, int cmd,
@@ -798,7 +798,7 @@
 					       struct socket *, int);
 extern int                      sock_no_getname(struct socket *,
 						struct sockaddr *, int *, int);
-extern unsigned int             sock_no_poll(struct socket *,
+extern unsigned int             sock_no_poll(struct file *, struct socket *,
 					     struct poll_table_struct *);
 extern int                      sock_no_ioctl(struct socket *, unsigned int,
 					      unsigned long);
@@ -879,7 +879,10 @@
 
 extern __inline__ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
-	if (atomic_read(&sk->rmem_alloc) + skb->truesize >= sk->rcvbuf)
+	/* Cast skb->rcvbuf to unsigned... It's pointless, but reduces
+	   number of warnings when compiling with -W --ANK
+	 */
+	if (atomic_read(&sk->rmem_alloc) + skb->truesize >= (unsigned)sk->rcvbuf)
                 return -ENOMEM;
         skb_set_owner_r(skb, sk);
 
@@ -899,7 +902,10 @@
 
 extern __inline__ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
-	if (atomic_read(&sk->rmem_alloc) + skb->truesize >= sk->rcvbuf)
+	/* Cast skb->rcvbuf to unsigned... It's pointless, but reduces
+	   number of warnings when compiling with -W --ANK
+	 */
+	if (atomic_read(&sk->rmem_alloc) + skb->truesize >= (unsigned)sk->rcvbuf)
 		return -ENOMEM;
 	skb_set_owner_r(skb, sk);
 	__skb_queue_tail(&sk->receive_queue,skb);
@@ -910,7 +916,10 @@
 
 extern __inline__ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
 {
-	if (atomic_read(&sk->rmem_alloc) + skb->truesize >= sk->rcvbuf)
+	/* Cast skb->rcvbuf to unsigned... It's pointless, but reduces
+	   number of warnings when compiling with -W --ANK
+	 */
+	if (atomic_read(&sk->rmem_alloc) + skb->truesize >= (unsigned)sk->rcvbuf)
 		return -ENOMEM;
 	skb_set_owner_r(skb, sk);
 	__skb_queue_tail(&sk->error_queue,skb);