net: make struct napi_alloc_cache::skb_count unsigned int

[mirror_ubuntu-bionic-kernel.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 1e3e0087245b713de61f51687fc4e06ea1025b50..4c96cb18c214c38cf59c1f77f92078d1e41888f0 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -354,7 +354,7 @@ EXPORT_SYMBOL(build_skb);
 
 struct napi_alloc_cache {
        struct page_frag_cache page;
-       size_t skb_count;
+       unsigned int skb_count;
        void *skb_cache[NAPI_SKB_CACHE_SIZE];
 };
 
@@ -3725,7 +3725,6 @@ struct sk_buff *sock_dequeue_err_skb(struct sock *sk)
                err = SKB_EXT_ERR(skb_next)->ee.ee_errno;
        spin_unlock_irqrestore(&q->lock, flags);
 
-       sk->sk_err = err;
        if (err)
                sk->sk_error_report(sk);