diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-06 10:31:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-06 10:31:26 -0400 |
| commit | 4b01abc977574253f466f65463019de2571c6401 (patch) | |
| tree | c330615fe9f277ad51a91da3db2d690a3336fb02 /drivers/s390/net/qeth_tso.h | |
| parent | 47c96298cd0b04b4478206fde55fd6a6431de980 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge branch 'master'
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 1286ddea450b..24ef40ca9562 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, | |||
| 117 | int fragno; | 117 | int fragno; |
| 118 | unsigned long addr; | 118 | unsigned long addr; |
| 119 | int element, cnt, dlen; | 119 | int element, cnt, dlen; |
| 120 | 120 | ||
| 121 | fragno = skb_shinfo(skb)->nr_frags; | 121 | fragno = skb_shinfo(skb)->nr_frags; |
| 122 | element = *next_element_to_fill; | 122 | element = *next_element_to_fill; |
| 123 | dlen = 0; | 123 | dlen = 0; |
| 124 | 124 | ||
| 125 | if (is_tso) | 125 | if (is_tso) |
| 126 | buffer->element[element].flags = | 126 | buffer->element[element].flags = |
| 127 | SBAL_FLAGS_MIDDLE_FRAG; | 127 | SBAL_FLAGS_MIDDLE_FRAG; |