From 3c75a33edf5a6b3dc54fa52670691a3786874266 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 22 Aug 2011 14:47:43 -0700 Subject: [PATCH] --- yaml --- r: 265511 b: refs/heads/master c: 7ae9ed8d3221c9f7dd4bc2773ff58797487d5ed8 h: refs/heads/master i: 265509: 21edc247d8ca5f39e4dba82d7eb6aafe102d507e 265507: 82b8055e3c146c4d68e909704d77d233538428ad 265503: 98dc0426778f67841e5f5a22d0ae9252af8bc7c1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/hdlc_ppp.c | 14 +++++++------- trunk/net/core/dev.c | 7 +++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index f3a1985fdf8c..e03a918e7b6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b38d355eaa223e420d0c45ff7a3279ea811552c5 +refs/heads/master: 7ae9ed8d3221c9f7dd4bc2773ff58797487d5ed8 diff --git a/trunk/drivers/net/wan/hdlc_ppp.c b/trunk/drivers/net/wan/hdlc_ppp.c index 055a918067e6..0d7645581f91 100644 --- a/trunk/drivers/net/wan/hdlc_ppp.c +++ b/trunk/drivers/net/wan/hdlc_ppp.c @@ -515,37 +515,37 @@ static int ppp_rx(struct sk_buff *skb) switch (cp->code) { case CP_CONF_REQ: ppp_cp_parse_cr(dev, pid, cp->id, len, skb->data); - goto out; + break; case CP_CONF_ACK: if (cp->id == proto->cr_id) ppp_cp_event(dev, pid, RCA, 0, 0, 0, NULL); - goto out; + break; case CP_CONF_REJ: case CP_CONF_NAK: if (cp->id == proto->cr_id) ppp_cp_event(dev, pid, RCN, 0, 0, 0, NULL); - goto out; + break; case CP_TERM_REQ: ppp_cp_event(dev, pid, RTR, 0, cp->id, 0, NULL); - goto out; + break; case CP_TERM_ACK: ppp_cp_event(dev, pid, RTA, 0, 0, 0, NULL); - goto out; + break; case CP_CODE_REJ: ppp_cp_event(dev, pid, RXJ_BAD, 0, 0, 0, NULL); - goto out; + break; default: len += sizeof(struct cp_header); if (len > dev->mtu) len = dev->mtu; ppp_cp_event(dev, pid, RUC, 0, 0, len, cp); - goto out; + break; } goto out; diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index c2442b46646e..a4306f7e4d09 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3236,10 +3236,9 @@ static int __netif_receive_skb(struct sk_buff *skb) ret = deliver_skb(skb, pt_prev, orig_dev); pt_prev = NULL; } - if (vlan_do_receive(&skb)) { - ret = __netif_receive_skb(skb); - goto out; - } else if (unlikely(!skb)) + if (vlan_do_receive(&skb)) + goto another_round; + else if (unlikely(!skb)) goto out; }