aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-04-15 11:24:36 +0100
committerAlex Shi <alex.shi@linaro.org>2015-04-15 20:03:08 +0800
commitb7a1b22726f0618b4e7adcdb12266ed898a550c9 (patch)
tree95e0f79305afec9d0d072b23c1d535a56f72869c
parent02c8f54ff799ab4289677e0c584554b4d8a28917 (diff)
netfilter: nfnetlink_queue: Fix "discards ‘const’ qualifier" warning
nfqnl_zcopy can now modify the 'from' sk_buff, so drop the const qualifier and fix build warnings like: net/netfilter/nfnetlink_queue_core.c: In function ‘nfqnl_zcopy’: net/netfilter/nfnetlink_queue_core.c:264:15: warning: passing argument 1 of ‘skb_orphan_frags’ discards ‘const’ qualifier from pointer target type if (unlikely(skb_orphan_frags(from, GFP_ATOMIC))) { Fixes: c5f0c0e75254 ("core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors") Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--net/netfilter/nfnetlink_queue_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c
index 2b8199f68785..5497f50af2f0 100644
--- a/net/netfilter/nfnetlink_queue_core.c
+++ b/net/netfilter/nfnetlink_queue_core.c
@@ -228,7 +228,7 @@ nfqnl_flush(struct nfqnl_instance *queue, nfqnl_cmpfn cmpfn, unsigned long data)
}
static int
-nfqnl_zcopy(struct sk_buff *to, const struct sk_buff *from, int len, int hlen)
+nfqnl_zcopy(struct sk_buff *to, struct sk_buff *from, int len, int hlen)
{
int i, j = 0;
int plen = 0; /* length of skb->head fragment */