git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
drivers
/
s390
/
net
/
qeth_eddp.c
diff --git
a/drivers/s390/net/qeth_eddp.c
b/drivers/s390/net/qeth_eddp.c
index
0bab60a
..
38aad83
100644
(file)
--- a/
drivers/s390/net/qeth_eddp.c
+++ b/
drivers/s390/net/qeth_eddp.c
@@
-420,7
+420,7
@@
__qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
}
tcph = eddp->skb->h.th;
while (eddp->skb_offset < eddp->skb->len) {
}
tcph = eddp->skb->h.th;
while (eddp->skb_offset < eddp->skb->len) {
- data_len = min((int)skb_shinfo(eddp->skb)->
t
so_size,
+ data_len = min((int)skb_shinfo(eddp->skb)->
g
so_size,
(int)(eddp->skb->len - eddp->skb_offset));
/* prepare qdio hdr */
if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2){
(int)(eddp->skb->len - eddp->skb_offset));
/* prepare qdio hdr */
if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2){
@@
-515,20
+515,20
@@
qeth_eddp_calc_num_pages(struct qeth_eddp_context *ctx, struct sk_buff *skb,
QETH_DBF_TEXT(trace, 5, "eddpcanp");
/* can we put multiple skbs in one page? */
QETH_DBF_TEXT(trace, 5, "eddpcanp");
/* can we put multiple skbs in one page? */
- skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->
t
so_size + hdr_len);
+ skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->
g
so_size + hdr_len);
if (skbs_per_page > 1){
if (skbs_per_page > 1){
- ctx->num_pages = (skb_shinfo(skb)->
t
so_segs + 1) /
+ ctx->num_pages = (skb_shinfo(skb)->
g
so_segs + 1) /
skbs_per_page + 1;
ctx->elements_per_skb = 1;
} else {
/* no -> how many elements per skb? */
skbs_per_page + 1;
ctx->elements_per_skb = 1;
} else {
/* no -> how many elements per skb? */
- ctx->elements_per_skb = (skb_shinfo(skb)->
t
so_size + hdr_len +
+ ctx->elements_per_skb = (skb_shinfo(skb)->
g
so_size + hdr_len +
PAGE_SIZE) >> PAGE_SHIFT;
ctx->num_pages = ctx->elements_per_skb *
PAGE_SIZE) >> PAGE_SHIFT;
ctx->num_pages = ctx->elements_per_skb *
- (skb_shinfo(skb)->
t
so_segs + 1);
+ (skb_shinfo(skb)->
g
so_segs + 1);
}
ctx->num_elements = ctx->elements_per_skb *
}
ctx->num_elements = ctx->elements_per_skb *
- (skb_shinfo(skb)->
t
so_segs + 1);
+ (skb_shinfo(skb)->
g
so_segs + 1);
}
static inline struct qeth_eddp_context *
}
static inline struct qeth_eddp_context *