Commit 4c0e1e4b authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents cad6dc2f 6fffe657
...@@ -32,10 +32,7 @@ ...@@ -32,10 +32,7 @@
#include <linux/in_route.h> #include <linux/in_route.h>
#include <net/route.h> #include <net/route.h>
#include <net/arp.h> #include <net/arp.h>
#ifndef _SNMP_H
#include <net/snmp.h> #include <net/snmp.h>
#endif
struct sock; struct sock;
......
...@@ -558,7 +558,7 @@ Note: we do not have explicit unassign, but look at _push() ...@@ -558,7 +558,7 @@ Note: we do not have explicit unassign, but look at _push()
atmvcc->push = br2684_push; atmvcc->push = br2684_push;
skb_queue_head_init(&copy); skb_queue_head_init(&copy);
skb_migrate(&atmvcc->sk->sk_receive_queue, &copy); skb_migrate(&atmvcc->sk->sk_receive_queue, &copy);
while ((skb = skb_dequeue(&copy))) { while ((skb = skb_dequeue(&copy)) != NULL) {
BRPRIV(skb->dev)->stats.rx_bytes -= skb->len; BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
BRPRIV(skb->dev)->stats.rx_packets--; BRPRIV(skb->dev)->stats.rx_packets--;
br2684_push(atmvcc, skb); br2684_push(atmvcc, skb);
......
...@@ -503,7 +503,7 @@ static int clip_mkip(struct atm_vcc *vcc,int timeout) ...@@ -503,7 +503,7 @@ static int clip_mkip(struct atm_vcc *vcc,int timeout)
skb_queue_head_init(&copy); skb_queue_head_init(&copy);
skb_migrate(&vcc->sk->sk_receive_queue, &copy); skb_migrate(&vcc->sk->sk_receive_queue, &copy);
/* re-process everything received between connection setup and MKIP */ /* re-process everything received between connection setup and MKIP */
while ((skb = skb_dequeue(&copy))) while ((skb = skb_dequeue(&copy)) != NULL)
if (!clip_devs) { if (!clip_devs) {
atm_return(vcc,skb->truesize); atm_return(vcc,skb->truesize);
kfree_skb(skb); kfree_skb(skb);
......
...@@ -187,7 +187,7 @@ static void vcc_destroy_socket(struct sock *sk) ...@@ -187,7 +187,7 @@ static void vcc_destroy_socket(struct sock *sk)
vcc_remove_socket(sk); /* no more receive */ vcc_remove_socket(sk); /* no more receive */
while ((skb = skb_dequeue(&vcc->sk->sk_receive_queue))) { while ((skb = skb_dequeue(&vcc->sk->sk_receive_queue)) != NULL) {
atm_return(vcc,skb->truesize); atm_return(vcc,skb->truesize);
kfree_skb(skb); kfree_skb(skb);
} }
......
...@@ -567,7 +567,7 @@ lec_atm_close(struct atm_vcc *vcc) ...@@ -567,7 +567,7 @@ lec_atm_close(struct atm_vcc *vcc)
if (skb_peek(&vcc->sk->sk_receive_queue)) if (skb_peek(&vcc->sk->sk_receive_queue))
printk("%s lec_atm_close: closing with messages pending\n", printk("%s lec_atm_close: closing with messages pending\n",
dev->name); dev->name);
while ((skb = skb_dequeue(&vcc->sk->sk_receive_queue))) { while ((skb = skb_dequeue(&vcc->sk->sk_receive_queue)) != NULL) {
atm_return(vcc, skb->truesize); atm_return(vcc, skb->truesize);
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
...@@ -1940,7 +1940,7 @@ lec_arp_check_expire(unsigned long data) ...@@ -1940,7 +1940,7 @@ lec_arp_check_expire(unsigned long data)
priv->path_switching_delay)) { priv->path_switching_delay)) {
struct sk_buff *skb; struct sk_buff *skb;
while ((skb = skb_dequeue(&entry->tx_wait))) while ((skb = skb_dequeue(&entry->tx_wait)) != NULL)
lec_send(entry->vcc, skb, entry->priv); lec_send(entry->vcc, skb, entry->priv);
entry->last_used = jiffies; entry->last_used = jiffies;
entry->status = entry->status =
...@@ -2337,7 +2337,7 @@ lec_flush_complete(struct lec_priv *priv, unsigned long tran_id) ...@@ -2337,7 +2337,7 @@ lec_flush_complete(struct lec_priv *priv, unsigned long tran_id)
entry->status == ESI_FLUSH_PENDING) { entry->status == ESI_FLUSH_PENDING) {
struct sk_buff *skb; struct sk_buff *skb;
while ((skb = skb_dequeue(&entry->tx_wait))) while ((skb = skb_dequeue(&entry->tx_wait)) != NULL)
lec_send(entry->vcc, skb, entry->priv); lec_send(entry->vcc, skb, entry->priv);
entry->status = ESI_FORWARD_DIRECT; entry->status = ESI_FORWARD_DIRECT;
DPRINTK("LEC_ARP: Flushed\n"); DPRINTK("LEC_ARP: Flushed\n");
......
...@@ -66,7 +66,7 @@ static void svc_disconnect(struct atm_vcc *vcc) ...@@ -66,7 +66,7 @@ static void svc_disconnect(struct atm_vcc *vcc)
} }
/* beware - socket is still in use by atmsigd until the last /* beware - socket is still in use by atmsigd until the last
as_indicate has been answered */ as_indicate has been answered */
while ((skb = skb_dequeue(&vcc->sk->sk_receive_queue))) { while ((skb = skb_dequeue(&vcc->sk->sk_receive_queue)) != NULL) {
DPRINTK("LISTEN REL\n"); DPRINTK("LISTEN REL\n");
sigd_enq2(NULL,as_reject,vcc,NULL,NULL,&vcc->qos,0); sigd_enq2(NULL,as_reject,vcc,NULL,NULL,&vcc->qos,0);
dev_kfree_skb(skb); dev_kfree_skb(skb);
......
...@@ -523,7 +523,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, ...@@ -523,7 +523,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
v.tm.tv_usec = 0; v.tm.tv_usec = 0;
} else { } else {
v.tm.tv_sec = sk->sk_rcvtimeo / HZ; v.tm.tv_sec = sk->sk_rcvtimeo / HZ;
v.tm.tv_usec = ((sk->sk_rcvtimeo % HZ) * 1000) / HZ; v.tm.tv_usec = ((sk->sk_rcvtimeo % HZ) * 1000000) / HZ;
} }
break; break;
...@@ -534,7 +534,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, ...@@ -534,7 +534,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
v.tm.tv_usec = 0; v.tm.tv_usec = 0;
} else { } else {
v.tm.tv_sec = sk->sk_sndtimeo / HZ; v.tm.tv_sec = sk->sk_sndtimeo / HZ;
v.tm.tv_usec = ((sk->sk_sndtimeo % HZ) * 1000) / HZ; v.tm.tv_usec = ((sk->sk_sndtimeo % HZ) * 1000000) / HZ;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment