diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /net/appletalk/ddp.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'net/appletalk/ddp.c')
| -rw-r--r-- | net/appletalk/ddp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 07b5b82c5eab..0c850427a85b 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
| @@ -959,7 +959,7 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset, | |||
| 959 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | 959 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { |
| 960 | int end; | 960 | int end; |
| 961 | 961 | ||
| 962 | BUG_TRAP(start <= offset + len); | 962 | WARN_ON(start > offset + len); |
| 963 | 963 | ||
| 964 | end = start + skb_shinfo(skb)->frags[i].size; | 964 | end = start + skb_shinfo(skb)->frags[i].size; |
| 965 | if ((copy = end - offset) > 0) { | 965 | if ((copy = end - offset) > 0) { |
| @@ -986,7 +986,7 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset, | |||
| 986 | for (; list; list = list->next) { | 986 | for (; list; list = list->next) { |
| 987 | int end; | 987 | int end; |
| 988 | 988 | ||
| 989 | BUG_TRAP(start <= offset + len); | 989 | WARN_ON(start > offset + len); |
| 990 | 990 | ||
| 991 | end = start + list->len; | 991 | end = start + list->len; |
| 992 | if ((copy = end - offset) > 0) { | 992 | if ((copy = end - offset) > 0) { |