From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 16 Apr 2015 08:12:53 +0000 (+0800)
Subject: Revert "net: Reset secmark when scrubbing packet"
X-Git-Tag: omap-for-v4.1/fixes-rc1~108^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c0ee414e877b899f7fc80aafb98d9425c02797f;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed