diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /net/ipv4/cipso_ipv4.c | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
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, | |||
| 1933 | &cipso_ptr[6], | 1933 | &cipso_ptr[6], |
| 1934 | secattr); | 1934 | secattr); |
| 1935 | break; | 1935 | break; |
| 1936 | case CIPSO_V4_TAG_RANGE: | ||
| 1937 | ret_val = cipso_v4_parsetag_rng(doi_def, | ||
| 1938 | &cipso_ptr[6], | ||
| 1939 | secattr); | ||
| 1940 | break; | ||
| 1936 | } | 1941 | } |
| 1937 | 1942 | ||
| 1938 | skbuff_getattr_return: | 1943 | skbuff_getattr_return: |