Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / tls / tls_device.c

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 43922d8..a470df7 100644 (file)
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -243,14 +243,14 @@ static void tls_append_frag(struct tls_record_info *record,
        skb_frag_t *frag;
 
        frag = &record->frags[record->num_frags - 1];
-       if (frag->page.p == pfrag->page &&
-           frag->page_offset + frag->size == pfrag->offset) {
-               frag->size += size;
+       if (skb_frag_page(frag) == pfrag->page &&
+           skb_frag_off(frag) + skb_frag_size(frag) == pfrag->offset) {
+               skb_frag_size_add(frag, size);
        } else {
                ++frag;
-               frag->page.p = pfrag->page;
-               frag->page_offset = pfrag->offset;
-               frag->size = size;
+               __skb_frag_set_page(frag, pfrag->page);
+               skb_frag_off_set(frag, pfrag->offset);
+               skb_frag_size_set(frag, size);
                ++record->num_frags;
                get_page(pfrag->page);
        }
@@ -301,8 +301,8 @@ static int tls_push_record(struct sock *sk,
                frag = &record->frags[i];
                sg_unmark_end(&offload_ctx->sg_tx_data[i]);
                sg_set_page(&offload_ctx->sg_tx_data[i], skb_frag_page(frag),
-                           frag->size, frag->page_offset);
-               sk_mem_charge(sk, frag->size);
+                           skb_frag_size(frag), skb_frag_off(frag));
+               sk_mem_charge(sk, skb_frag_size(frag));
                get_page(skb_frag_page(frag));
        }
        sg_mark_end(&offload_ctx->sg_tx_data[record->num_frags - 1]);
@@ -324,7 +324,7 @@ static int tls_create_new_record(struct tls_offload_context_tx *offload_ctx,
 
        frag = &record->frags[0];
        __skb_frag_set_page(frag, pfrag->page);
-       frag->page_offset = pfrag->offset;
+       skb_frag_off_set(frag, pfrag->offset);
        skb_frag_size_set(frag, prepend_size);
 
        get_page(pfrag->page);