[Devel] [PATCH RHEL7 COMMIT] ve/veth: don't drop skb->mark if NETIF_F_VENET is set

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.11
------>
commit 04a2ef31f08928bc96700b31f8bb22e5593f0c85
Author: Andrew Vagin <avagin at openvz.org>
Date:   Mon Jun 8 20:29:03 2015 +0400

    ve/veth: don't drop skb->mark if NETIF_F_VENET is set
    
    It's required for the virtuozzo traffic shaping.
    
    See commit d6d2385a872895a5ebc325ef745533d6b561eb5c for detailed
    feature description.
    
    https://jira.sw.ru/browse/PSBM-32277
    
    Signed-off-by: Andrew Vagin <avagin at openvz.org>
    Reviewed-by: Kirill Tkhai <ktkhai at odin.com>
---
 net/core/skbuff.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index fdc3180..86b5900 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3631,7 +3631,8 @@ void skb_scrub_packet(struct sk_buff *skb)
 	skb->pkt_type = PACKET_HOST;
 	skb->skb_iif = 0;
 	skb_dst_drop(skb);
-	skb->mark = 0;
+	if (!(skb->dev->features & NETIF_F_VENET))
+		skb->mark = 0;
 	secpath_reset(skb);
 	nf_reset(skb);
 	nf_reset_trace(skb);