drivers/base/platform.c: fix small typo in doc

[linux-2.6-omap-h63xx.git] / drivers / s390 / net / qeth_eddp.c

diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index b8e84674e1707393dd0ac9f60a7fad57c20820f3..4640f32daae5832ed75e410a5bcc131bfc180098 100644 (file)
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -267,7 +267,8 @@ qeth_eddp_copy_data_tcp(char *dst, struct qeth_eddp_data *eddp, int len,
 
        QETH_DBF_TEXT(trace, 5, "eddpcdtc");
        if (skb_shinfo(eddp->skb)->nr_frags == 0) {
-               memcpy(dst, eddp->skb->data + eddp->skb_offset, len);
+               skb_copy_from_linear_data_offset(eddp->skb, eddp->skb_offset,
+                                                dst, len);
                *hcsum = csum_partial(eddp->skb->data + eddp->skb_offset, len,
                                      *hcsum);
                eddp->skb_offset += len;
@@ -476,13 +477,13 @@ qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
                eddp = qeth_eddp_create_eddp_data(qhdr,
                                                  skb_network_header(skb),
                                                  ip_hdrlen(skb),
-                                                 skb->h.raw,
+                                                 skb_transport_header(skb),
                                                  tcp_hdrlen(skb));
        else
                eddp = qeth_eddp_create_eddp_data(qhdr,
                                                  skb_network_header(skb),
                                                  sizeof(struct ipv6hdr),
-                                                 skb->h.raw,
+                                                 skb_transport_header(skb),
                                                  tcp_hdrlen(skb));
 
        if (eddp == NULL) {
@@ -619,10 +620,10 @@ qeth_eddp_create_context_tcp(struct qeth_card *card, struct sk_buff *skb,
 
 struct qeth_eddp_context *
 qeth_eddp_create_context(struct qeth_card *card, struct sk_buff *skb,
-                        struct qeth_hdr *qhdr)
+                        struct qeth_hdr *qhdr, unsigned char sk_protocol)
 {
        QETH_DBF_TEXT(trace, 5, "creddpc");
-       switch (skb->sk->sk_protocol){
+       switch (sk_protocol) {
        case IPPROTO_TCP:
                return qeth_eddp_create_context_tcp(card, skb, qhdr);
        default: