diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:10:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:10:40 -0700 |
commit | 0f5a2c553d1484141ebb369ecab61894e9cb074f (patch) | |
tree | ba7667fb37832e1714dc2a8b3b3e45dade4af5cb /net/sctp/auth.c | |
parent | 26adc0d5859788b74f86677538236f807e6d9021 (diff) | |
parent | 68e3f5dd4db62619fdbe520d36c9ebf62e672256 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[CRYPTO] users: Fix up scatterlist conversion errors
[CRYPTO] tcrypt: Move sg_init_table out of timing loops
[NETNS]: Fix get_net_ns_by_pid
[NET]: Marking struct pernet_operations __net_initdata was inappropriate
[INET] ESP: Must #include <linux/scatterlist.h>
[TCP] IPV6: fix softnet build breakage
Diffstat (limited to 'net/sctp/auth.c')
-rw-r--r-- | net/sctp/auth.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index c9dbc3afa99..8af1004abef 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -726,8 +726,7 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc, /* set up scatter list */ end = skb_tail_pointer(skb); - sg_init_table(&sg, 1); - sg_set_buf(&sg, auth, end - (unsigned char *)auth); + sg_init_one(&sg, auth, end - (unsigned char *)auth); desc.tfm = asoc->ep->auth_hmacs[hmac_id]; desc.flags = 0; |