diff options
Diffstat (limited to 'net/ipv6/ip6mr.c')
-rw-r--r-- | net/ipv6/ip6mr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 0e1d53bcf1e0..618f67ccda31 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
@@ -1039,7 +1039,6 @@ static void ip6mr_cache_resolve(struct net *net, struct mr6_table *mrt, | |||
1039 | 1039 | ||
1040 | while((skb = __skb_dequeue(&uc->mfc_un.unres.unresolved))) { | 1040 | while((skb = __skb_dequeue(&uc->mfc_un.unres.unresolved))) { |
1041 | if (ipv6_hdr(skb)->version == 0) { | 1041 | if (ipv6_hdr(skb)->version == 0) { |
1042 | int err; | ||
1043 | struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull(skb, sizeof(struct ipv6hdr)); | 1042 | struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull(skb, sizeof(struct ipv6hdr)); |
1044 | 1043 | ||
1045 | if (__ip6mr_fill_mroute(mrt, skb, c, NLMSG_DATA(nlh)) > 0) { | 1044 | if (__ip6mr_fill_mroute(mrt, skb, c, NLMSG_DATA(nlh)) > 0) { |
@@ -1050,7 +1049,7 @@ static void ip6mr_cache_resolve(struct net *net, struct mr6_table *mrt, | |||
1050 | skb_trim(skb, nlh->nlmsg_len); | 1049 | skb_trim(skb, nlh->nlmsg_len); |
1051 | ((struct nlmsgerr *)NLMSG_DATA(nlh))->error = -EMSGSIZE; | 1050 | ((struct nlmsgerr *)NLMSG_DATA(nlh))->error = -EMSGSIZE; |
1052 | } | 1051 | } |
1053 | err = rtnl_unicast(skb, net, NETLINK_CB(skb).pid); | 1052 | rtnl_unicast(skb, net, NETLINK_CB(skb).pid); |
1054 | } else | 1053 | } else |
1055 | ip6_mr_forward(net, mrt, skb, c); | 1054 | ip6_mr_forward(net, mrt, skb, c); |
1056 | } | 1055 | } |