diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-10-28 11:01:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-28 11:01:07 -0700 |
| commit | b3ed4bc082077045f680400c8bb02fa8d9c9ecf5 (patch) | |
| tree | 688e77a9da979bb978dddb4d02374d1c532bceac /drivers/s390/net/qeth_core_main.c | |
| parent | mac80211.h: fix kernel-doc excesses (diff) | |
| parent | dm9601: runtime mac address change support (diff) | |
| download | linux-dev-b3ed4bc082077045f680400c8bb02fa8d9c9ecf5.tar.xz linux-dev-b3ed4bc082077045f680400c8bb02fa8d9c9ecf5.zip | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/s390/net/qeth_core_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 7de410d5be4a..52d26592c72c 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -3025,7 +3025,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb, struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, int offset) { - int length = skb->len - offset; + int length = skb->len; int length_here; int element; char *data; @@ -3037,6 +3037,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb, if (offset >= 0) { data = skb->data + offset; + length -= offset; first_lap = 0; } |