From patchwork Tue Sep 15 11:32:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 33637 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 5DE2AB70CF for ; Tue, 15 Sep 2009 21:32:31 +1000 (EST) Received: by ozlabs.org (Postfix) id 51F8EDDDA2; Tue, 15 Sep 2009 21:32:31 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id EA1F3DDDA0 for ; Tue, 15 Sep 2009 21:32:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753102AbZIOLcW (ORCPT ); Tue, 15 Sep 2009 07:32:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753099AbZIOLcV (ORCPT ); Tue, 15 Sep 2009 07:32:21 -0400 Received: from yop.chewa.net ([91.121.105.214]:59541 "EHLO yop.chewa.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753017AbZIOLcU (ORCPT ); Tue, 15 Sep 2009 07:32:20 -0400 Received: by yop.chewa.net (Postfix, from userid 1007) id 8FF03510; Tue, 15 Sep 2009 13:32:23 +0200 (CEST) From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= To: netdev@vger.kernel.org Cc: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= Subject: [PATCH 5/5] Phonet: forward incoming packets Date: Tue, 15 Sep 2009 14:32:23 +0300 Message-Id: <1253014343-20326-5-git-send-email-remi@remlab.net> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1253014343-20326-4-git-send-email-remi@remlab.net> References: <1253014343-20326-1-git-send-email-remi@remlab.net> <1253014343-20326-2-git-send-email-remi@remlab.net> <1253014343-20326-3-git-send-email-remi@remlab.net> <1253014343-20326-4-git-send-email-remi@remlab.net> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rémi Denis-Courmont From: Rémi Denis-Courmont Signed-off-by: Rémi Denis-Courmont --- net/phonet/af_phonet.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index f0ef6f8..e69c915 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -394,8 +394,40 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev, send_obj_unreachable(skb); send_reset_indications(skb); } + } else if (unlikely(skb->pkt_type == PACKET_LOOPBACK)) + goto out; /* Race between address deletion and loopback */ + else { + /* Phonet packet routing */ + struct net_device *out_dev; + + out_dev = phonet_route_output(net, pn_sockaddr_get_addr(&sa)); + if (!out_dev) { + LIMIT_NETDEBUG(KERN_WARNING"No Phonet route to %02X\n", + pn_sockaddr_get_addr(&sa)); + goto out; + } + + __skb_push(skb, sizeof(struct phonethdr)); + skb->dev = out_dev; + if (out_dev == dev) { + LIMIT_NETDEBUG(KERN_ERR"Phonet loop to %02X on %s\n", + pn_sockaddr_get_addr(&sa), dev->name); + goto out_dev; + } + /* Some drivers (e.g. TUN) do not allocate HW header space */ + if (skb_cow_head(skb, out_dev->hard_header_len)) + goto out_dev; + + if (dev_hard_header(skb, out_dev, ETH_P_PHONET, NULL, NULL, + skb->len) < 0) + goto out_dev; + dev_queue_xmit(skb); + dev_put(out_dev); + return NET_RX_SUCCESS; } +out_dev: + dev_put(skb->dev); out: kfree_skb(skb); return NET_RX_DROP;