evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vxlan: Restructure vxlan receive.

Browse source 
Use iptunnel_pull_header() for better code sharing.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pravin B Shelar 2013-08-19 11:22:54 -07:00 • committed by David S. Miller
parent 9c2e24e16f
commit 7ce0475827
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/net/vxlan.c
View file

@ -57,6 +57,7 @@
#define VXLAN_VID_MASK (VXLAN_N_VID - 1) #define VXLAN_VID_MASK (VXLAN_N_VID - 1)
/* IP header + UDP + VXLAN + Ethernet header */ /* IP header + UDP + VXLAN + Ethernet header */
#define VXLAN_HEADROOM (20 + 8 + 8 + 14) #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. */ #define VXLAN_FLAGS 0x08000000 /* struct vxlanhdr.vx_flags required value. */
@ -868,15 +869,12 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
__u32 vni; __u32 vni;
int err; int err;
/* pop off outer UDP header */
__skb_pull(skb, sizeof(struct udphdr));
/* Need Vxlan and inner Ethernet header to be present */ /* 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; goto error;
/* Drop packets with reserved bits set */ /* Return packets with reserved bits set */
vxh = (struct vxlanhdr *) skb->data; vxh = (struct vxlanhdr *)(udp_hdr(skb) + 1);
if (vxh->vx_flags != htonl(VXLAN_FLAGS) || if (vxh->vx_flags != htonl(VXLAN_FLAGS) ||
(vxh->vx_vni & htonl(0xff))) { (vxh->vx_vni & htonl(0xff))) {
netdev_dbg(skb->dev, "invalid vxlan flags=%#x vni=%#x\n", netdev_dbg(skb->dev, "invalid vxlan flags=%#x vni=%#x\n",
@ -884,8 +882,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
goto error; goto error;
} }
__skb_pull(skb, sizeof(struct vxlanhdr));
/* Is this VNI defined? */ /* Is this VNI defined? */
vni = ntohl(vxh->vx_vni) >> 8; vni = ntohl(vxh->vx_vni) >> 8;
port = inet_sk(sk)->inet_sport; port = inet_sk(sk)->inet_sport;
@ -896,7 +892,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
goto drop; 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_length_errors++;
vxlan->dev->stats.rx_errors++; vxlan->dev->stats.rx_errors++;
goto drop; goto drop;
@ -904,8 +900,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
/* Re-examine inner Ethernet packet */
oip = ip_hdr(skb);
skb->protocol = eth_type_trans(skb, vxlan->dev); skb->protocol = eth_type_trans(skb, vxlan->dev);
/* Ignore packet loops (and multicast echo) */ /* Ignore packet loops (and multicast echo) */
@ -913,11 +907,12 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
vxlan->dev->dev_addr) == 0) vxlan->dev->dev_addr) == 0)
goto drop; goto drop;
/* Re-examine inner Ethernet packet */
oip = ip_hdr(skb);
if ((vxlan->flags & VXLAN_F_LEARN) && if ((vxlan->flags & VXLAN_F_LEARN) &&
vxlan_snoop(skb->dev, oip->saddr, eth_hdr(skb)->h_source)) vxlan_snoop(skb->dev, oip->saddr, eth_hdr(skb)->h_source))
goto drop; goto drop;
__skb_tunnel_rx(skb, vxlan->dev);
skb_reset_network_header(skb); skb_reset_network_header(skb);
/* If the NIC driver gave us an encapsulated packet with /* If the NIC driver gave us an encapsulated packet with
@ -953,9 +948,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
return 0; return 0;
error: error:
/* Put UDP header back */
__skb_push(skb, sizeof(struct udphdr));
return 1; return 1;
drop: drop:
/* Consume bad packet */ /* Consume bad packet */