* [PATCH net-next 7/8] vxlan: Add tx-vlan offload support.
@ 2013-06-20 7:26 Pravin B Shelar
2013-06-20 12:29 ` Sergei Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Pravin B Shelar @ 2013-06-20 7:26 UTC (permalink / raw)
To: netdev, dev; +Cc: Pravin B Shelar
Following patch allows transmit side vlan offload for vxlan
devices.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
drivers/net/vxlan.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index e53c947..a7feba4 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -27,6 +27,7 @@
#include <linux/igmp.h>
#include <linux/etherdevice.h>
#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
#include <linux/hash.h>
#include <linux/ethtool.h>
#include <net/arp.h>
@@ -1049,13 +1050,23 @@ int vxlan_xmit_skb(struct net *net, struct vxlan_handler *vh,
}
min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len
- + VXLAN_HLEN + sizeof(struct iphdr);
+ + VXLAN_HLEN + sizeof(struct iphdr)
+ + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
/* Need space for new headers (invalidates iph ptr) */
err = skb_cow_head(skb, min_headroom);
if (unlikely(err))
return err;
+ if (vlan_tx_tag_present(skb)) {
+ if (unlikely(!__vlan_put_tag(skb,
+ skb->vlan_proto,
+ vlan_tx_tag_get(skb)))) {
+ return -ENOMEM;
+ }
+ skb->vlan_tci = 0;
+ }
+
vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
vxh->vx_flags = htonl(VXLAN_FLAGS);
vxh->vx_vni = vni;
@@ -1389,6 +1400,8 @@ static void vxlan_setup(struct net_device *dev)
dev->features |= NETIF_F_RXCSUM;
dev->features |= NETIF_F_GSO_SOFTWARE;
+ dev->vlan_features = dev->features;
+ dev->features |= NETIF_F_HW_VLAN_CTAG_TX;
dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
dev->hw_features |= NETIF_F_GSO_SOFTWARE;
dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next 7/8] vxlan: Add tx-vlan offload support.
2013-06-20 7:26 [PATCH net-next 7/8] vxlan: Add tx-vlan offload support Pravin B Shelar
@ 2013-06-20 12:29 ` Sergei Shtylyov
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2013-06-20 12:29 UTC (permalink / raw)
To: Pravin B Shelar; +Cc: netdev, dev
Hello.
On 20-06-2013 11:26, Pravin B Shelar wrote:
> Following patch allows transmit side vlan offload for vxlan
> devices.
> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
> ---
> drivers/net/vxlan.c | 15 ++++++++++++++-
> 1 files changed, 14 insertions(+), 1 deletions(-)
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index e53c947..a7feba4 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
[...]
> @@ -1049,13 +1050,23 @@ int vxlan_xmit_skb(struct net *net, struct vxlan_handler *vh,
[...]
> + if (vlan_tx_tag_present(skb)) {
> + if (unlikely(!__vlan_put_tag(skb,
> + skb->vlan_proto,
> + vlan_tx_tag_get(skb)))) {
> + return -ENOMEM;
> + }
You haven't run this patch thru scripts/checkpatch.pl, have you? It
should have warned you about using {} on single statement branch.
> + skb->vlan_tci = 0;
> + }
> +
WBR, Sergei
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-20 12:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-20 7:26 [PATCH net-next 7/8] vxlan: Add tx-vlan offload support Pravin B Shelar
2013-06-20 12:29 ` Sergei Shtylyov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.