From fab677c3f5fa9f01ed835c02e423c9289c594d5f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Aug 2011 00:47:02 +0000 Subject: [PATCH] --- yaml --- r: 265717 b: refs/heads/master c: 8d36bb0de70bfd57f15c48bc8fb6886f3dcc96ae h: refs/heads/master i: 265715: 49803795eb08c7fd869ee392c41d5a36e18328b2 v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_core_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index efb7468e81fa..006f960ba7d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bb97cae662ea6e2a5aa5982d0b289a8c48d64c6 +refs/heads/master: 8d36bb0de70bfd57f15c48bc8fb6886f3dcc96ae diff --git a/trunk/drivers/s390/net/qeth_core_main.c b/trunk/drivers/s390/net/qeth_core_main.c index 97172f8a15b7..81534437373a 100644 --- a/trunk/drivers/s390/net/qeth_core_main.c +++ b/trunk/drivers/s390/net/qeth_core_main.c @@ -3694,7 +3694,8 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb, for (cnt = 0; cnt < skb_shinfo(skb)->nr_frags; cnt++) { frag = &skb_shinfo(skb)->frags[cnt]; - buffer->element[element].addr = (char *)page_to_phys(frag->page) + buffer->element[element].addr = (char *) + page_to_phys(skb_frag_page(frag)) + frag->page_offset; buffer->element[element].length = frag->size; buffer->element[element].eflags = SBAL_EFLAGS_MIDDLE_FRAG;