diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 10:33:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 10:33:07 -0500 |
| commit | f6866fecd6fd8e44a6715da09844a4fd1b8484da (patch) | |
| tree | a166c399ddb37a48035589ffda29ef05d236c4b4 /net/core/skbuff.c | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
| parent | 997b37da1515c1620692521786a74af271664eb7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
[NET]: Make sure sockets implement splice_read
netconsole: avoid null pointer dereference at show_local_mac()
[IPV6]: Fix reversed local_df test in ip6_fragment
[XFRM]: Avoid bogus BUG() when throwing new policy away.
[AF_KEY]: Fix bug in spdadd
[NETFILTER] nf_conntrack_proto_tcp.c: Mistyped state corrected.
net: xfrm statistics depend on INET
[NETFILTER]: make secmark_tg_destroy() static
[INET]: Unexport inet_listen_wlock
[INET]: Unexport __inet_hash_connect
[NET]: Improve cache line coherency of ingress qdisc
[NET]: Fix race in dev_close(). (Bug 9750)
[IPSEC]: Fix bogus usage of u64 on input sequence number
[RTNETLINK]: Send a single notification on device state changes.
[NETLABLE]: Hide netlbl_unlabel_audit_addr6 under ifdef CONFIG_IPV6.
[NETLABEL]: Don't produce unused variables when IPv6 is off.
[NETLABEL]: Compilation for CONFIG_AUDIT=n case.
[GENETLINK]: Relax dances with genl_lock.
[NETLABEL]: Fix lookup logic of netlbl_domhsh_search_def.
[IPV6]: remove unused method declaration (net/ndisc.h).
...
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index cfc07dac636c..0d0fd28a9041 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -2106,11 +2106,10 @@ int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | |||
| 2106 | /** | 2106 | /** |
| 2107 | * skb_pull_rcsum - pull skb and update receive checksum | 2107 | * skb_pull_rcsum - pull skb and update receive checksum |
| 2108 | * @skb: buffer to update | 2108 | * @skb: buffer to update |
| 2109 | * @start: start of data before pull | ||
| 2110 | * @len: length of data pulled | 2109 | * @len: length of data pulled |
| 2111 | * | 2110 | * |
| 2112 | * This function performs an skb_pull on the packet and updates | 2111 | * This function performs an skb_pull on the packet and updates |
| 2113 | * update the CHECKSUM_COMPLETE checksum. It should be used on | 2112 | * the CHECKSUM_COMPLETE checksum. It should be used on |
| 2114 | * receive path processing instead of skb_pull unless you know | 2113 | * receive path processing instead of skb_pull unless you know |
| 2115 | * that the checksum difference is zero (e.g., a valid IP header) | 2114 | * that the checksum difference is zero (e.g., a valid IP header) |
| 2116 | * or you are setting ip_summed to CHECKSUM_NONE. | 2115 | * or you are setting ip_summed to CHECKSUM_NONE. |