diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
| commit | c444debaaa22011b4a84e58e5333575b3f800a33 (patch) | |
| tree | 896a9589aa9e701896da7ea1ae6a24cb04495b8f /net/core/user_dma.c | |
| parent | 70ef6d595b6e51618a0cbe44b848d8c9db11a010 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'net/core/user_dma.c')
| -rw-r--r-- | net/core/user_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/user_dma.c b/net/core/user_dma.c index 0ad1cd57bc39..c77aff9c6eb3 100644 --- a/net/core/user_dma.c +++ b/net/core/user_dma.c | |||
| @@ -75,7 +75,7 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan, | |||
| 75 | 75 | ||
| 76 | end = start + skb_shinfo(skb)->frags[i].size; | 76 | end = start + skb_shinfo(skb)->frags[i].size; |
| 77 | copy = end - offset; | 77 | copy = end - offset; |
| 78 | if ((copy = end - offset) > 0) { | 78 | if (copy > 0) { |
| 79 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; | 79 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; |
| 80 | struct page *page = frag->page; | 80 | struct page *page = frag->page; |
| 81 | 81 | ||