* [PATCH net-next v5 6/7] vxlan: Add tx-vlan offload support.
@ 2013-07-31 23:14 Pravin B Shelar
2013-08-01 13:11 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Pravin B Shelar @ 2013-07-31 23:14 UTC (permalink / raw)
To: netdev; +Cc: stephen, Pravin B Shelar
Following patch allows transmit side vlan offload for vxlan
devices.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
v2-v3:
- Set NETIF_F_HW_VLAN_STAG_TX feature.
- Added WARN on vlan tag push.
- Fixed hw_features.
---
drivers/net/vxlan.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index f9c7c75..2f35a2b 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>
@@ -1123,13 +1124,25 @@ int vxlan_xmit_skb(struct net *net, struct vxlan_sock *vs,
}
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)))) {
+ WARN_ON(1);
+ return -ENOMEM;
+ }
+
+ skb->vlan_tci = 0;
+ }
+
vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
vxh->vx_flags = htonl(VXLAN_FLAGS);
vxh->vx_vni = vni;
@@ -1540,8 +1553,11 @@ 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 | NETIF_F_HW_VLAN_STAG_TX;
dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+ dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;
dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v5 6/7] vxlan: Add tx-vlan offload support.
2013-07-31 23:14 [PATCH net-next v5 6/7] vxlan: Add tx-vlan offload support Pravin B Shelar
@ 2013-08-01 13:11 ` Sergei Shtylyov
2013-08-01 17:24 ` Pravin Shelar
0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2013-08-01 13:11 UTC (permalink / raw)
To: Pravin B Shelar; +Cc: netdev, stephen
Hello.
On 01-08-2013 3:14, Pravin B Shelar wrote:
> Following patch allows transmit side vlan offload for vxlan
> devices.
> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
> ---
> v2-v3:
> - Set NETIF_F_HW_VLAN_STAG_TX feature.
> - Added WARN on vlan tag push.
> - Fixed hw_features.
> ---
> drivers/net/vxlan.c | 18 +++++++++++++++++-
> 1 files changed, 17 insertions(+), 1 deletions(-)
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index f9c7c75..2f35a2b 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
[...]
> @@ -1123,13 +1124,25 @@ int vxlan_xmit_skb(struct net *net, struct vxlan_sock *vs,
[...]
> + if (vlan_tx_tag_present(skb)) {
> + if (unlikely(!__vlan_put_tag(skb,
> + skb->vlan_proto,
> + vlan_tx_tag_get(skb)))) {
> + WARN_ON(1);
> + return -ENOMEM;
> + }
if (WARN_ON(!__vlan_put_tag(skb,
skb->vlan_proto,
vlan_tx_tag_get(skb))))
return -ENOMEM;
should be equivalent.
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v5 6/7] vxlan: Add tx-vlan offload support.
2013-08-01 13:11 ` Sergei Shtylyov
@ 2013-08-01 17:24 ` Pravin Shelar
0 siblings, 0 replies; 3+ messages in thread
From: Pravin Shelar @ 2013-08-01 17:24 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: netdev, stephen
On Thu, Aug 1, 2013 at 6:11 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
>
> On 01-08-2013 3:14, Pravin B Shelar wrote:
>
>> Following patch allows transmit side vlan offload for vxlan
>> devices.
>
>
>> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
>> ---
>> v2-v3:
>> - Set NETIF_F_HW_VLAN_STAG_TX feature.
>> - Added WARN on vlan tag push.
>> - Fixed hw_features.
>> ---
>> drivers/net/vxlan.c | 18 +++++++++++++++++-
>> 1 files changed, 17 insertions(+), 1 deletions(-)
>
>
>> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
>> index f9c7c75..2f35a2b 100644
>> --- a/drivers/net/vxlan.c
>> +++ b/drivers/net/vxlan.c
>
> [...]
>
>> @@ -1123,13 +1124,25 @@ int vxlan_xmit_skb(struct net *net, struct
>> vxlan_sock *vs,
>
> [...]
>
>> + if (vlan_tx_tag_present(skb)) {
>> + if (unlikely(!__vlan_put_tag(skb,
>> + skb->vlan_proto,
>> + vlan_tx_tag_get(skb)))) {
>> + WARN_ON(1);
>> + return -ENOMEM;
>> + }
>
>
> if (WARN_ON(!__vlan_put_tag(skb,
> skb->vlan_proto,
> vlan_tx_tag_get(skb))))
> return -ENOMEM;
>
> should be equivalent.
ok. I will update the patch.
>
> WBR, Sergei
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-01 17:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-31 23:14 [PATCH net-next v5 6/7] vxlan: Add tx-vlan offload support Pravin B Shelar
2013-08-01 13:11 ` Sergei Shtylyov
2013-08-01 17:24 ` Pravin Shelar
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).