diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 22:01:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 22:01:26 -0400 |
| commit | 983f27d37d4fc72c252835cb2ee3103b360735a6 (patch) | |
| tree | 8a7d3c3e251db494e285896debeb906473178a3e /drivers/s390/net/qeth_tso.h | |
| parent | de1e938e54deba5b093a3074dfafd0d11afacbe1 (diff) | |
| parent | e82b0f2cc21be905e504573483fa9542b15df96f (diff) | |
| download | kernel_samsung_tuna-983f27d37d4fc72c252835cb2ee3103b360735a6.zip kernel_samsung_tuna-983f27d37d4fc72c252835cb2ee3103b360735a6.tar.gz kernel_samsung_tuna-983f27d37d4fc72c252835cb2ee3103b360735a6.tar.bz2 | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/s390/net/ctctty.c
Diffstat (limited to 'drivers/s390/net/qeth_tso.h')
| -rw-r--r-- | drivers/s390/net/qeth_tso.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h index 1286dde..24ef40c 100644 --- a/drivers/s390/net/qeth_tso.h +++ b/drivers/s390/net/qeth_tso.h @@ -117,11 +117,11 @@ __qeth_fill_buffer_frag(struct sk_buff *skb, struct qdio_buffer *buffer, int fragno; unsigned long addr; int element, cnt, dlen; - + fragno = skb_shinfo(skb)->nr_frags; element = *next_element_to_fill; dlen = 0; - + if (is_tso) buffer->element[element].flags = SBAL_FLAGS_MIDDLE_FRAG; |