From patchwork Tue Oct 9 17:56:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 190398 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3DCDC2C00C6 for ; Wed, 10 Oct 2012 05:02:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756660Ab2JISB5 (ORCPT ); Tue, 9 Oct 2012 14:01:57 -0400 Received: from fiji.vyatta.com ([76.74.103.50]:51693 "EHLO fiji.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755392Ab2JISB2 (ORCPT ); Tue, 9 Oct 2012 14:01:28 -0400 Received: by fiji.vyatta.com (Postfix, from userid 1051) id 9D5921540F3; Tue, 9 Oct 2012 09:49:19 -0700 (PDT) Message-Id: <20121009175714.462171246@vyatta.com> User-Agent: quilt/0.60-1 Date: Tue, 09 Oct 2012 10:56:38 -0700 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH 1/6] vxlan: minor output refactoring References: <20121009175637.048993312@vyatta.com> Content-Disposition: inline; filename=vxlan-dst.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move code to find destination to a small function. Signed-off-by: Stephen Hemminger --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/vxlan.c 2012-10-09 10:34:57.000000000 -0700 +++ b/drivers/net/vxlan.c 2012-10-09 10:48:56.546879617 -0700 @@ -621,6 +621,18 @@ static inline u8 vxlan_ecn_encap(u8 tos, return INET_ECN_encapsulate(tos, inner); } +static __be32 vxlan_find_dst(struct vxlan_dev *vxlan, struct sk_buff *skb) +{ + const struct ethhdr *eth = (struct ethhdr *) skb->data; + struct vxlan_fdb *f; + + if (is_multicast_ether_addr(eth->h_dest) || + (f = vxlan_find_mac(vxlan, eth->h_dest)) == NULL) + return vxlan->gaddr; + else + return f->remote_ip; +} + /* Transmit local packets over Vxlan * * Outer IP header inherits ECN and DF from inner header. @@ -632,13 +644,11 @@ static netdev_tx_t vxlan_xmit(struct sk_ { struct vxlan_dev *vxlan = netdev_priv(dev); struct rtable *rt; - const struct ethhdr *eth; const struct iphdr *old_iph; struct iphdr *iph; struct vxlanhdr *vxh; struct udphdr *uh; struct flowi4 fl4; - struct vxlan_fdb *f; unsigned int pkt_len = skb->len; u32 hash; __be32 dst; @@ -646,21 +656,16 @@ static netdev_tx_t vxlan_xmit(struct sk_ __u8 tos, ttl; int err; + dst = vxlan_find_dst(vxlan, skb); + if (!dst) + goto drop; + /* Need space for new headers (invalidates iph ptr) */ if (skb_cow_head(skb, VXLAN_HEADROOM)) goto drop; - eth = (void *)skb->data; old_iph = ip_hdr(skb); - if (!is_multicast_ether_addr(eth->h_dest) && - (f = vxlan_find_mac(vxlan, eth->h_dest))) - dst = f->remote_ip; - else if (vxlan->gaddr) { - dst = vxlan->gaddr; - } else - goto drop; - ttl = vxlan->ttl; if (!ttl && IN_MULTICAST(ntohl(dst))) ttl = 1;