Patched in Tegra support.

1 files changed, 10 insertions, 11 deletions

diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index 2906d520eea..fc91ad7ee26 100644
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -70,29 +70,26 @@ static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)
 
         while ((scratch += len, dlen -= len) > 0) {
                 skb_frag_t *frag;
-                struct page *page;
 
                 err = -EMSGSIZE;
                 if (WARN_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS))
                         goto out;
 
                 frag = skb_shinfo(skb)->frags + skb_shinfo(skb)->nr_frags;
-                page = alloc_page(GFP_ATOMIC);
+                frag->page = alloc_page(GFP_ATOMIC);
 
                 err = -ENOMEM;
-                if (!page)
+                if (!frag->page)
                         goto out;
 
-                __skb_frag_set_page(frag, page);
-
                 len = PAGE_SIZE;
                 if (dlen < len)
                         len = dlen;
 
-                frag->page_offset = 0;
-                skb_frag_size_set(frag, len);
-                memcpy(skb_frag_address(frag), scratch, len);
+                memcpy(page_address(frag->page), scratch, len);
 
+                frag->page_offset = 0;
+                frag->size = len;
                 skb->truesize += len;
                 skb->data_len += len;
                 skb->len += len;
@@ -276,16 +273,18 @@ static struct crypto_comp * __percpu *ipcomp_alloc_tfms(const char *alg_name)
         struct crypto_comp * __percpu *tfms;
         int cpu;
 
+        /* This can be any valid CPU ID so we don't need locking. */
+        cpu = raw_smp_processor_id();
 
         list_for_each_entry(pos, &ipcomp_tfms_list, list) {
                 struct crypto_comp *tfm;
 
-                /* This can be any valid CPU ID so we don't need locking. */
-                tfm = __this_cpu_read(*pos->tfms);
+                tfms = pos->tfms;
+                tfm = *per_cpu_ptr(tfms, cpu);
 
                 if (!strcmp(crypto_comp_name(tfm), alg_name)) {
                         pos->users++;
-                        return pos->tfms;
+                        return tfms;
                 }
         }