git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
qedf
/
qedf_main.c
diff --git
a/drivers/scsi/qedf/qedf_main.c
b/drivers/scsi/qedf/qedf_main.c
index 9c24f3834d70a9fdf9af5f1772c7588f90b991b7..1659d35cd37b5704436a29a1fb47fd02491712fe 100644
(file)
--- a/
drivers/scsi/qedf/qedf_main.c
+++ b/
drivers/scsi/qedf/qedf_main.c
@@
-1101,7
+1101,7
@@
static int qedf_xmit(struct fc_lport *lport, struct fc_frame *fp)
return -ENOMEM;
}
frag = &skb_shinfo(skb)->frags[skb_shinfo(skb)->nr_frags - 1];
- cp = kmap_atomic(skb_frag_page(frag)) +
frag->page_offset
;
+ cp = kmap_atomic(skb_frag_page(frag)) +
skb_frag_off(frag)
;
} else {
cp = skb_put(skb, tlen);
}