From 44dfec5e6dcc01a0ee0df1ee5663212d1163a58e Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Thu, 15 Jul 2010 08:47:33 +0000 Subject: [PATCH] --- yaml --- r: 203604 b: refs/heads/master c: bb7a0bd600ac2e09a8747ef89e692a2967ed8c97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_multicast.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a81ca8b601cf..a4014facc72b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2540ddb5124f883bba3d4af5d8920d44dd66e794 +refs/heads/master: bb7a0bd600ac2e09a8747ef89e692a2967ed8c97 diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c index 27ae946363f1..85afcdab4921 100644 --- a/trunk/net/bridge/br_multicast.c +++ b/trunk/net/bridge/br_multicast.c @@ -1435,7 +1435,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br, struct icmp6hdr *icmp6h; u8 nexthdr; unsigned len; - unsigned offset; + int offset; int err; if (!pskb_may_pull(skb, sizeof(*ip6h)))