Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150539
b: refs/heads/master
c: bec571e
h: refs/heads/master
i:
  150537: 04a6d93
  150535: ab382f4
v: v3
  • Loading branch information
David S. Miller committed May 28, 2009
1 parent c6c559b commit c1c05fe
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b6211ae7f2e56837c6a4849316396d1535606e90
refs/heads/master: bec571ec762a4cf855ad4446f833086fc154b60e
19 changes: 5 additions & 14 deletions trunk/net/decnet/af_decnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,14 +1250,8 @@ static int dn_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
if (skb) {
amount = skb->len;
} else {
skb = sk->sk_receive_queue.next;
for (;;) {
if (skb ==
(struct sk_buff *)&sk->sk_receive_queue)
break;
skb_queue_walk(&sk->sk_receive_queue, skb)
amount += skb->len;
skb = skb->next;
}
}
release_sock(sk);
err = put_user(amount, (int __user *)arg);
Expand Down Expand Up @@ -1644,13 +1638,13 @@ static int __dn_getsockopt(struct socket *sock, int level,int optname, char __us

static int dn_data_ready(struct sock *sk, struct sk_buff_head *q, int flags, int target)
{
struct sk_buff *skb = q->next;
struct sk_buff *skb;
int len = 0;

if (flags & MSG_OOB)
return !skb_queue_empty(q) ? 1 : 0;

while(skb != (struct sk_buff *)q) {
skb_queue_walk(q, skb) {
struct dn_skb_cb *cb = DN_SKB_CB(skb);
len += skb->len;

Expand All @@ -1666,8 +1660,6 @@ static int dn_data_ready(struct sock *sk, struct sk_buff_head *q, int flags, int
/* minimum data length for read exceeded */
if (len >= target)
return 1;

skb = skb->next;
}

return 0;
Expand All @@ -1683,7 +1675,7 @@ static int dn_recvmsg(struct kiocb *iocb, struct socket *sock,
size_t target = size > 1 ? 1 : 0;
size_t copied = 0;
int rv = 0;
struct sk_buff *skb, *nskb;
struct sk_buff *skb, *n;
struct dn_skb_cb *cb = NULL;
unsigned char eor = 0;
long timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
Expand Down Expand Up @@ -1758,7 +1750,7 @@ static int dn_recvmsg(struct kiocb *iocb, struct socket *sock,
finish_wait(sk->sk_sleep, &wait);
}

for(skb = queue->next; skb != (struct sk_buff *)queue; skb = nskb) {
skb_queue_walk_safe(queue, skb, n) {
unsigned int chunk = skb->len;
cb = DN_SKB_CB(skb);

Expand All @@ -1775,7 +1767,6 @@ static int dn_recvmsg(struct kiocb *iocb, struct socket *sock,
skb_pull(skb, chunk);

eor = cb->nsp_flags & 0x40;
nskb = skb->next;

if (skb->len == 0) {
skb_unlink(skb, queue);
Expand Down
8 changes: 2 additions & 6 deletions trunk/net/decnet/dn_nsp_out.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,26 +382,22 @@ int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff
{
struct dn_skb_cb *cb = DN_SKB_CB(skb);
struct dn_scp *scp = DN_SK(sk);
struct sk_buff *skb2, *list, *ack = NULL;
struct sk_buff *skb2, *n, *ack = NULL;
int wakeup = 0;
int try_retrans = 0;
unsigned long reftime = cb->stamp;
unsigned long pkttime;
unsigned short xmit_count;
unsigned short segnum;

skb2 = q->next;
list = (struct sk_buff *)q;
while(list != skb2) {
skb_queue_walk_safe(q, skb2, n) {
struct dn_skb_cb *cb2 = DN_SKB_CB(skb2);

if (dn_before_or_equal(cb2->segnum, acknum))
ack = skb2;

/* printk(KERN_DEBUG "ack: %s %04x %04x\n", ack ? "ACK" : "SKIP", (int)cb2->segnum, (int)acknum); */

skb2 = skb2->next;

if (ack == NULL)
continue;

Expand Down

0 comments on commit c1c05fe

Please sign in to comment.