* [PATCH net-next v6 2/8] vxlan: Restructure vxlan receive.
@ 2013-08-01 18:44 Pravin B Shelar
2013-08-04 21:43 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Pravin B Shelar @ 2013-08-01 18:44 UTC (permalink / raw)
To: netdev; +Cc: stephen, Pravin B Shelar
Use iptunnel_pull_header() for better code sharing.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
v5-v6:
split from second patch from v5 series.
---
drivers/net/vxlan.c | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 548294a..0ba2f24 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -57,6 +57,7 @@
#define VXLAN_VID_MASK (VXLAN_N_VID - 1)
/* IP header + UDP + VXLAN + Ethernet header */
#define VXLAN_HEADROOM (20 + 8 + 8 + 14)
+#define VXLAN_HLEN (sizeof(struct udphdr) + sizeof(struct vxlanhdr))
#define VXLAN_FLAGS 0x08000000 /* struct vxlanhdr.vx_flags required value. */
@@ -844,15 +845,12 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
__u32 vni;
int err;
- /* pop off outer UDP header */
- __skb_pull(skb, sizeof(struct udphdr));
-
/* Need Vxlan and inner Ethernet header to be present */
- if (!pskb_may_pull(skb, sizeof(struct vxlanhdr)))
+ if (!pskb_may_pull(skb, VXLAN_HLEN))
goto error;
- /* Drop packets with reserved bits set */
- vxh = (struct vxlanhdr *) skb->data;
+ /* Return packets with reserved bits set */
+ vxh = (struct vxlanhdr *)(udp_hdr(skb) + 1);
if (vxh->vx_flags != htonl(VXLAN_FLAGS) ||
(vxh->vx_vni & htonl(0xff))) {
netdev_dbg(skb->dev, "invalid vxlan flags=%#x vni=%#x\n",
@@ -860,8 +858,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
goto error;
}
- __skb_pull(skb, sizeof(struct vxlanhdr));
-
/* Is this VNI defined? */
vni = ntohl(vxh->vx_vni) >> 8;
port = inet_sk(sk)->inet_sport;
@@ -872,7 +868,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
goto drop;
}
- if (!pskb_may_pull(skb, ETH_HLEN)) {
+ if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB))) {
vxlan->dev->stats.rx_length_errors++;
vxlan->dev->stats.rx_errors++;
goto drop;
@@ -880,8 +876,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
skb_reset_mac_header(skb);
- /* Re-examine inner Ethernet packet */
- oip = ip_hdr(skb);
skb->protocol = eth_type_trans(skb, vxlan->dev);
/* Ignore packet loops (and multicast echo) */
@@ -889,11 +883,12 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
vxlan->dev->dev_addr) == 0)
goto drop;
+ /* Re-examine inner Ethernet packet */
+ oip = ip_hdr(skb);
if ((vxlan->flags & VXLAN_F_LEARN) &&
vxlan_snoop(skb->dev, oip->saddr, eth_hdr(skb)->h_source))
goto drop;
- __skb_tunnel_rx(skb, vxlan->dev);
skb_reset_network_header(skb);
/* If the NIC driver gave us an encapsulated packet with
@@ -929,9 +924,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
return 0;
error:
- /* Put UDP header back */
- __skb_push(skb, sizeof(struct udphdr));
-
return 1;
drop:
/* Consume bad packet */
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next v6 2/8] vxlan: Restructure vxlan receive.
2013-08-01 18:44 [PATCH net-next v6 2/8] vxlan: Restructure vxlan receive Pravin B Shelar
@ 2013-08-04 21:43 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2013-08-04 21:43 UTC (permalink / raw)
To: Pravin B Shelar; +Cc: netdev
On Thu, 1 Aug 2013 11:44:45 -0700
Pravin B Shelar <pshelar@nicira.com> wrote:
> Use iptunnel_pull_header() for better code sharing.
>
> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
This patch is good.
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-04 21:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-01 18:44 [PATCH net-next v6 2/8] vxlan: Restructure vxlan receive Pravin B Shelar
2013-08-04 21:43 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).