[Devel] [PATCH RHEL7 COMMIT] ve/net: drop sk_buff->accounted

[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.14
------>
commit af8b05bd44dda176c5bf52a0f96626c3de3464bf
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Wed Jun 17 13:54:14 2015 +0400

    ve/net: drop sk_buff->accounted
    
    It is not used anywhere.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 include/linux/skbuff.h | 3 ---
 net/core/skbuff.c      | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7263f72..5832e93 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -453,9 +453,6 @@ struct sk_buff {
 	kmemcheck_bitfield_end(flags1);
 	__be16			protocol;
 
-#ifdef CONFIG_VE
-	unsigned int		accounted:1;
-#endif
 	void			(*destructor)(struct sk_buff *skb);
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 	struct nf_conntrack	*nfct;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index bd5d5a3..ce1ecde 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -736,9 +736,6 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
 	new->vlan_proto		= old->vlan_proto;
 	new->vlan_tci		= old->vlan_tci;
 
-#ifdef CONFIG_VE
-	new->accounted = old->accounted;
-#endif
 	skb_copy_secmark(new, old);
 
 #ifdef CONFIG_NET_RX_BUSY_POLL
@@ -773,10 +770,6 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb)
 	C(truesize);
 	atomic_set(&n->users, 1);
 
-#ifdef CONFIG_VE
-	C(accounted);
-#endif
-
 	atomic_inc(&(skb_shinfo(skb)->dataref));
 	skb->cloned = 1;