diff options
author | Thomas Graf <tgraf@suug.ch> | 2005-07-05 17:12:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-05 17:12:44 -0400 |
commit | e176fe8954a5239c24afe79b1001ba3c29511963 (patch) | |
tree | 418038ddda59950ac83decb708f25cd612d0ffe0 /net | |
parent | 3154e540e374bbfd62693d95bc8ed51da95efe75 (diff) |
[NET]: Remove unused security member in sk_buff
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/skbuff.c | 2 | ||||
-rw-r--r-- | net/ipv4/ip_output.c | 1 | ||||
-rw-r--r-- | net/ipv6/ip6_output.c | 1 | ||||
-rw-r--r-- | net/sched/em_meta.c | 6 |
4 files changed, 0 insertions, 10 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index bb73b2190ec7..733deee24b9f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -357,7 +357,6 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask) | |||
357 | C(ip_summed); | 357 | C(ip_summed); |
358 | C(priority); | 358 | C(priority); |
359 | C(protocol); | 359 | C(protocol); |
360 | C(security); | ||
361 | n->destructor = NULL; | 360 | n->destructor = NULL; |
362 | #ifdef CONFIG_NETFILTER | 361 | #ifdef CONFIG_NETFILTER |
363 | C(nfmark); | 362 | C(nfmark); |
@@ -422,7 +421,6 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old) | |||
422 | new->pkt_type = old->pkt_type; | 421 | new->pkt_type = old->pkt_type; |
423 | new->stamp = old->stamp; | 422 | new->stamp = old->stamp; |
424 | new->destructor = NULL; | 423 | new->destructor = NULL; |
425 | new->security = old->security; | ||
426 | #ifdef CONFIG_NETFILTER | 424 | #ifdef CONFIG_NETFILTER |
427 | new->nfmark = old->nfmark; | 425 | new->nfmark = old->nfmark; |
428 | new->nfcache = old->nfcache; | 426 | new->nfcache = old->nfcache; |
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 6ce5c3292f9f..1bfa49eda96f 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
@@ -389,7 +389,6 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) | |||
389 | to->pkt_type = from->pkt_type; | 389 | to->pkt_type = from->pkt_type; |
390 | to->priority = from->priority; | 390 | to->priority = from->priority; |
391 | to->protocol = from->protocol; | 391 | to->protocol = from->protocol; |
392 | to->security = from->security; | ||
393 | dst_release(to->dst); | 392 | dst_release(to->dst); |
394 | to->dst = dst_clone(from->dst); | 393 | to->dst = dst_clone(from->dst); |
395 | to->dev = from->dev; | 394 | to->dev = from->dev; |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 06e7cdaeedc5..1f2c2f9e353f 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -465,7 +465,6 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from) | |||
465 | to->pkt_type = from->pkt_type; | 465 | to->pkt_type = from->pkt_type; |
466 | to->priority = from->priority; | 466 | to->priority = from->priority; |
467 | to->protocol = from->protocol; | 467 | to->protocol = from->protocol; |
468 | to->security = from->security; | ||
469 | dst_release(to->dst); | 468 | dst_release(to->dst); |
470 | to->dst = dst_clone(from->dst); | 469 | to->dst = dst_clone(from->dst); |
471 | to->dev = from->dev; | 470 | to->dev = from->dev; |
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 48bb23c2a35a..53d98f8d3d80 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c | |||
@@ -205,11 +205,6 @@ META_COLLECTOR(int_protocol) | |||
205 | dst->value = skb->protocol; | 205 | dst->value = skb->protocol; |
206 | } | 206 | } |
207 | 207 | ||
208 | META_COLLECTOR(int_security) | ||
209 | { | ||
210 | dst->value = skb->security; | ||
211 | } | ||
212 | |||
213 | META_COLLECTOR(int_pkttype) | 208 | META_COLLECTOR(int_pkttype) |
214 | { | 209 | { |
215 | dst->value = skb->pkt_type; | 210 | dst->value = skb->pkt_type; |
@@ -524,7 +519,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = { | |||
524 | [META_ID(REALDEV)] = META_FUNC(int_realdev), | 519 | [META_ID(REALDEV)] = META_FUNC(int_realdev), |
525 | [META_ID(PRIORITY)] = META_FUNC(int_priority), | 520 | [META_ID(PRIORITY)] = META_FUNC(int_priority), |
526 | [META_ID(PROTOCOL)] = META_FUNC(int_protocol), | 521 | [META_ID(PROTOCOL)] = META_FUNC(int_protocol), |
527 | [META_ID(SECURITY)] = META_FUNC(int_security), | ||
528 | [META_ID(PKTTYPE)] = META_FUNC(int_pkttype), | 522 | [META_ID(PKTTYPE)] = META_FUNC(int_pkttype), |
529 | [META_ID(PKTLEN)] = META_FUNC(int_pktlen), | 523 | [META_ID(PKTLEN)] = META_FUNC(int_pktlen), |
530 | [META_ID(DATALEN)] = META_FUNC(int_datalen), | 524 | [META_ID(DATALEN)] = META_FUNC(int_datalen), |