From f7e3775d78d32893f4a6d2ac91cc4ed96a06f17b Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 24 Aug 2011 22:28:07 +0000 Subject: [PATCH] --- yaml --- r: 265548 b: refs/heads/master c: c517202f3cf1cd189259c50d55622d8c7ab16eb2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/atm/eni.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cd25cd19d47e..cfac8505f3db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 767df1c7174406127d3619c2f7a862655b34074f +refs/heads/master: c517202f3cf1cd189259c50d55622d8c7ab16eb2 diff --git a/trunk/drivers/atm/eni.c b/trunk/drivers/atm/eni.c index 93071417315f..f7ca4c13d61d 100644 --- a/trunk/drivers/atm/eni.c +++ b/trunk/drivers/atm/eni.c @@ -1134,7 +1134,8 @@ DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */ skb_headlen(skb)); else put_dma(tx->index,eni_dev->dma,&j,(unsigned long) - skb_shinfo(skb)->frags[i].page + skb_shinfo(skb)->frags[i].page_offset, + skb_frag_page(&skb_shinfo(skb)->frags[i]) + + skb_shinfo(skb)->frags[i].page_offset, skb_shinfo(skb)->frags[i].size); } if (skb->len & 3)