diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-30 23:57:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-30 23:57:40 -0700 |
| commit | e5e7ad44d05d3f8227a10a17761505fce2c08e38 (patch) | |
| tree | 2417654b9fbc2f709a1c8990894c2712a8d671e1 /net/ipv4/cipso_ipv4.c | |
| parent | 61e5744849cb936bf4361181b8f9ebccebf4d9db (diff) | |
| parent | 47b676c0e03dcfd88de91f6f24a06653cfdf32af (diff) | |
| download | blackbird-op-linux-e5e7ad44d05d3f8227a10a17761505fce2c08e38.tar.gz blackbird-op-linux-e5e7ad44d05d3f8227a10a17761505fce2c08e38.zip | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
| -rw-r--r-- | net/ipv4/cipso_ipv4.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 490e035c6d90..2e78f6bd9775 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -2063,9 +2063,10 @@ int cipso_v4_skbuff_setattr(struct sk_buff *skb, u32 opt_len; int len_delta; - buf_len = cipso_v4_genopt(buf, buf_len, doi_def, secattr); - if (buf_len < 0) - return buf_len; + ret_val = cipso_v4_genopt(buf, buf_len, doi_def, secattr); + if (ret_val < 0) + return ret_val; + buf_len = ret_val; opt_len = (buf_len + 3) & ~3; /* we overwrite any existing options to ensure that we have enough |
