Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351971
b: refs/heads/master
c: faeed82
h: refs/heads/master
i:
  351969: 035ebd5
  351967: 8f9d9d6
v: v3
  • Loading branch information
Cong Wang authored and David S. Miller committed Jan 28, 2013
1 parent 1902b4a commit 04e5ecc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5fbee843c32e5de2d8af68ba0bdd113bb0af9d86
refs/heads/master: faeed828f9607923e9dc22182e819908e95c8852
6 changes: 3 additions & 3 deletions trunk/net/core/netpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ static void netpoll_neigh_reply(struct sk_buff *skb, struct netpoll_info *npinfo

spin_lock_irqsave(&npinfo->rx_lock, flags);
list_for_each_entry_safe(np, tmp, &npinfo->rx_np, rx) {
if (memcmp(daddr, &np->local_ip, sizeof(*daddr)))
if (!ipv6_addr_equal(daddr, &np->local_ip.in6))
continue;

hlen = LL_RESERVED_SPACE(np->dev);
Expand Down Expand Up @@ -828,9 +828,9 @@ int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo)
if (udp6_csum_init(skb, uh, IPPROTO_UDP))
goto out;
list_for_each_entry_safe(np, tmp, &npinfo->rx_np, rx) {
if (memcmp(&np->local_ip.in6, &ip6h->daddr, sizeof(struct in6_addr)) != 0)
if (!ipv6_addr_equal(&np->local_ip.in6, &ip6h->daddr))
continue;
if (memcmp(&np->remote_ip.in6, &ip6h->saddr, sizeof(struct in6_addr)) != 0)
if (!ipv6_addr_equal(&np->remote_ip.in6, &ip6h->saddr))
continue;
if (np->local_port && np->local_port != ntohs(uh->dest))
continue;
Expand Down

0 comments on commit 04e5ecc

Please sign in to comment.