Revert "net: Reset secmark when scrubbing packet"
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 16 Apr 2015 08:12:53 +0000 (16:12 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Apr 2015 18:19:02 +0000 (14:19 -0400)
commit4c0ee414e877b899f7fc80aafb98d9425c02797f
treee26eafcb6e5c0f73b5f8d24f11f12a4f06439fa7
parent725f9dcd58dedfea49ef958babf6c0bf6b7594a9
Revert "net: Reset secmark when scrubbing packet"

This patch reverts commit b8fb4e0648a2ab3734140342002f68fb0c7d1602
because the secmark must be preserved even when a packet crosses
namespace boundaries.  The reason is that security labels apply to
the system as a whole and is not per-namespace.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c