From 7e95b98825cf58e13171a8b8fdc26fa5876069fb Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Fri, 27 May 2011 20:36:51 -0400 Subject: [PATCH] --- yaml --- r: 253391 b: refs/heads/master c: d232b8dded624af3e346b13807a591c63b601c44 h: refs/heads/master i: 253389: ddd07d780810d66c9d9bf44a35b5ebf0167a3e68 253387: 970c3ca133d4c5164819c0d64458540fa69aaf9e 253383: 15167560634730a96a167cb876baf4c3543fbe61 253375: a666078b0bbba5b0cb397123c282ee87080a64d7 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_queue.c | 3 ++- trunk/net/ipv6/netfilter/ip6_queue.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1857e350d2b1..6a98f16e6a80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88ed01d17b44bc2bed4ad4835d3b1099bff3dd71 +refs/heads/master: d232b8dded624af3e346b13807a591c63b601c44 diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c index d2c1311cb28d..f7f9bd7ba12d 100644 --- a/trunk/net/ipv4/netfilter/ip_queue.c +++ b/trunk/net/ipv4/netfilter/ip_queue.c @@ -402,7 +402,8 @@ ipq_dev_drop(int ifindex) static inline void __ipq_rcv_skb(struct sk_buff *skb) { - int status, type, pid, flags, nlmsglen, skblen; + int status, type, pid, flags; + unsigned int nlmsglen, skblen; struct nlmsghdr *nlh; skblen = skb->len; diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c index 413ab0754e1f..065fe405fb58 100644 --- a/trunk/net/ipv6/netfilter/ip6_queue.c +++ b/trunk/net/ipv6/netfilter/ip6_queue.c @@ -403,7 +403,8 @@ ipq_dev_drop(int ifindex) static inline void __ipq_rcv_skb(struct sk_buff *skb) { - int status, type, pid, flags, nlmsglen, skblen; + int status, type, pid, flags; + unsigned int nlmsglen, skblen; struct nlmsghdr *nlh; skblen = skb->len;