[NET]: Turn nfmark into generic mark

nfmark is being used in various subsystems and has become
the defacto mark field for all kinds of packets. Therefore
it makes sense to rename it to `mark' and remove the
dependency on CONFIG_NETFILTER.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 23489f7232d2..3482839af280 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1236,7 +1236,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
                                        .saddr = cb->src,
                                        .scope = RT_SCOPE_UNIVERSE,
 #ifdef CONFIG_DECNET_ROUTE_FWMARK
-                                       .fwmark = skb->nfmark
+                                       .fwmark = skb->mark
 #endif
                                     } },
                             .iif = skb->dev->ifindex };
@@ -1458,7 +1458,7 @@ int dn_route_input(struct sk_buff *skb)
                     (rt->fl.fld_dst == cb->dst) &&
                     (rt->fl.oif == 0) &&
 #ifdef CONFIG_DECNET_ROUTE_FWMARK
-                    (rt->fl.fld_fwmark == skb->nfmark) &&
+                    (rt->fl.fld_fwmark == skb->mark) &&
 #endif
                     (rt->fl.iif == cb->iif)) {
                         rt->u.dst.lastuse = jiffies;