diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-03-01 02:36:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-01 12:35:03 -0800 |
| commit | f6b9664f8b711cf4fd53e70aa0d21f72d5bf806c (patch) | |
| tree | 878a8438b00e58b9b898a74f3cc4a32c1d5d8477 /include | |
| parent | 1c32c5ad6fac8cee1a77449f5abf211e911ff830 (diff) | |
| download | linux-3.10-f6b9664f8b711cf4fd53e70aa0d21f72d5bf806c.tar.gz linux-3.10-f6b9664f8b711cf4fd53e70aa0d21f72d5bf806c.tar.bz2 linux-3.10-f6b9664f8b711cf4fd53e70aa0d21f72d5bf806c.zip | |
udp: Switch to ip_finish_skb
This patch converts UDP to use the new ip_finish_skb API. This
would then allows us to more easily use ip_make_skb which allows
UDP to run without a socket lock.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/udp.h | 11 | ||||
| -rw-r--r-- | include/net/udplite.h | 12 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index e82f3a8c0f8..67ea6fcb3ec 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -144,6 +144,17 @@ static inline __wsum udp_csum_outgoing(struct sock *sk, struct sk_buff *skb) return csum; } +static inline __wsum udp_csum(struct sk_buff *skb) +{ + __wsum csum = csum_partial(skb_transport_header(skb), + sizeof(struct udphdr), skb->csum); + + for (skb = skb_shinfo(skb)->frag_list; skb; skb = skb->next) { + csum = csum_add(csum, skb->csum); + } + return csum; +} + /* hash routines shared between UDPv4/6 and UDP-Litev4/6 */ static inline void udp_lib_hash(struct sock *sk) { diff --git a/include/net/udplite.h b/include/net/udplite.h index afdffe607b2..673a024c6b2 100644 --- a/include/net/udplite.h +++ b/include/net/udplite.h @@ -115,6 +115,18 @@ static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb) return csum; } +static inline __wsum udplite_csum(struct sk_buff *skb) +{ + struct sock *sk = skb->sk; + int cscov = udplite_sender_cscov(udp_sk(sk), udp_hdr(skb)); + const int off = skb_transport_offset(skb); + const int len = skb->len - off; + + skb->ip_summed = CHECKSUM_NONE; /* no HW support for checksumming */ + + return skb_checksum(skb, off, min(cscov, len), 0); +} + extern void udplite4_register(void); extern int udplite_get_port(struct sock *sk, unsigned short snum, int (*scmp)(const struct sock *, const struct sock *)); |