diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 18:12:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-12 18:12:42 -0700 |
| commit | 27d30b0f4e0c8e63f48ef400a64fc073b71bfe59 (patch) | |
| tree | 55440b5ab26f8d8f0ad6702f69fd29202239785d /net/ipv4/cipso_ipv4.c | |
| parent | 2cb8a57b9851805883dfe92cf5d88a726134a384 (diff) | |
| parent | 75e252d981c0e80c14ce90df246e9b1300474c4f (diff) | |
| download | talos-op-linux-27d30b0f4e0c8e63f48ef400a64fc073b71bfe59.tar.gz talos-op-linux-27d30b0f4e0c8e63f48ef400a64fc073b71bfe59.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[XFRM]: Fix missing protocol comparison of larval SAs.
[WANROUTER]: Delete superfluous source file "net/wanrouter/af_wanpipe.c".
[IPV4]: Fix warning in ip_mc_rejoin_group.
[ROSE]: Socket locking is a great invention.
[ROSE]: Remove ourselves from waitqueue when receiving a signal
[NetLabel]: parse the CIPSO ranged tag on incoming packets
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
| -rw-r--r-- | net/ipv4/cipso_ipv4.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index c976dd7e9758..2ce5b693a8bd 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -1933,6 +1933,11 @@ int cipso_v4_skbuff_getattr(const struct sk_buff *skb, &cipso_ptr[6], secattr); break; + case CIPSO_V4_TAG_RANGE: + ret_val = cipso_v4_parsetag_rng(doi_def, + &cipso_ptr[6], + secattr); + break; } skbuff_getattr_return: |
