diff for duplicates of <4615BCA1.6000608@hp.com> diff --git a/a/1.txt b/N1/1.txt index ed3f356..dc539a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,12 +27,12 @@ index 00328b7..d473789 100644 +static inline int ipv6_addr_scope_linklocal(const struct in6_addr *a) +{ -+ return ((a->s6_addr32[0] & htonl(0xFFC00000)) = htonl(0xFE800000)); ++ return ((a->s6_addr32[0] & htonl(0xFFC00000)) == htonl(0xFE800000)); +} + +static inline int ipv6_addr_scope_sitelocal(const struct in6_addr *a) +{ -+ return ((a->s6_addr32[0] & htonl(0xFFC00000)) = htonl(0xFEC00000)); ++ return ((a->s6_addr32[0] & htonl(0xFFC00000)) == htonl(0xFEC00000)); +} + /* @@ -56,9 +56,9 @@ index 47d3adf..2d4fe24 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2634,7 +2634,7 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp) - if (ifp->idev->cnf.forwarding = 0 && + if (ifp->idev->cnf.forwarding == 0 && ifp->idev->cnf.rtr_solicits > 0 && - (dev->flags&IFF_LOOPBACK) = 0 && + (dev->flags&IFF_LOOPBACK) == 0 && - (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) { + ipv6_addr_scope_linklocal(&ifp->addr)) { struct in6_addr all_routers; @@ -100,7 +100,8 @@ index 4a355fe..a8612b2 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -323,7 +323,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len) - sin->sin6_flowinfo (*(__be32 *)(nh + serr->addr_offset - 24) & + sin->sin6_flowinfo = + (*(__be32 *)(nh + serr->addr_offset - 24) & IPV6_FLOWINFO_MASK); - if (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL) + if (ipv6_addr_scope_linklocal(&sin->sin6_addr)) @@ -130,7 +131,7 @@ index 4a355fe..a8612b2 100644 - addr_type = ipv6_addr_type(&src_info->ipi6_addr); - -- if (addr_type = IPV6_ADDR_ANY) +- if (addr_type == IPV6_ADDR_ANY) + if (ipv6_addr_any(&src_info->ipi6_addr)) break; @@ -185,7 +186,7 @@ index 6c27589..d2d31a2 100644 - int addr_type; /* Our own report looped back. Ignore it. */ - if (skb->pkt_type = PACKET_LOOPBACK) + if (skb->pkt_type == PACKET_LOOPBACK) @@ -1303,9 +1302,8 @@ int igmp6_event_report(struct sk_buff *skb) hdr = icmp6_hdr(skb); @@ -272,7 +273,7 @@ index f0f7dc6..537978c 100644 + ipv6_addr_scope_linklocal(&treq->rmt_addr)) treq->iif = inet6_iif(skb); - if (isn = 0) + if (isn == 0) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index bd2856f..c0b5fe3 100644 --- a/net/ipv6/udp.c diff --git a/a/content_digest b/N1/content_digest index 05788b2..8a13e5e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,12 @@ + "ref\011758281863002-git-send-email-brian.haley@hp.com\0" "From\0Brian Haley <brian.haley@hp.com>\0" "Subject\0[PATCH 1/4] [IPv6] Add link and site-local scope inline\0" - "Date\0Fri, 06 Apr 2007 03:21:05 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Thu, 05 Apr 2007 23:21:05 -0400\0" + "To\0David Miller <davem@davemloft.net>" + " YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>\0" + "Cc\0netdev@vger.kernel.org" + dccp@vger.kernel.org + " lksctp-developers@lists.sourceforge.net\0" "\00:1\0" "b\0" "Add link and site-local scope inline to avoid calls to ipv6_addr_type().\n" @@ -33,12 +38,12 @@ "\n" "+static inline int ipv6_addr_scope_linklocal(const struct in6_addr *a)\n" "+{\n" - "+\treturn ((a->s6_addr32[0] & htonl(0xFFC00000)) = htonl(0xFE800000));\n" + "+\treturn ((a->s6_addr32[0] & htonl(0xFFC00000)) == htonl(0xFE800000));\n" "+}\n" "+\n" "+static inline int ipv6_addr_scope_sitelocal(const struct in6_addr *a)\n" "+{\n" - "+\treturn ((a->s6_addr32[0] & htonl(0xFFC00000)) = htonl(0xFEC00000));\n" + "+\treturn ((a->s6_addr32[0] & htonl(0xFFC00000)) == htonl(0xFEC00000));\n" "+}\n" "+\n" " /*\n" @@ -62,9 +67,9 @@ "--- a/net/ipv6/addrconf.c\n" "+++ b/net/ipv6/addrconf.c\n" "@@ -2634,7 +2634,7 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)\n" - " \tif (ifp->idev->cnf.forwarding = 0 &&\n" + " \tif (ifp->idev->cnf.forwarding == 0 &&\n" " \t ifp->idev->cnf.rtr_solicits > 0 &&\n" - " \t (dev->flags&IFF_LOOPBACK) = 0 &&\n" + " \t (dev->flags&IFF_LOOPBACK) == 0 &&\n" "-\t (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {\n" "+\t ipv6_addr_scope_linklocal(&ifp->addr)) {\n" " \t\tstruct in6_addr all_routers;\n" @@ -106,7 +111,8 @@ "--- a/net/ipv6/datagram.c\n" "+++ b/net/ipv6/datagram.c\n" "@@ -323,7 +323,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)\n" - " \t\t\t\tsin->sin6_flowinfo \t\t\t\t\t(*(__be32 *)(nh + serr->addr_offset - 24) &\n" + " \t\t\t\tsin->sin6_flowinfo =\n" + " \t\t\t\t\t(*(__be32 *)(nh + serr->addr_offset - 24) &\n" " \t\t\t\t\t IPV6_FLOWINFO_MASK);\n" "-\t\t\tif (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL)\n" "+\t\t\tif (ipv6_addr_scope_linklocal(&sin->sin6_addr))\n" @@ -136,7 +142,7 @@ "\n" "-\t\t\taddr_type = ipv6_addr_type(&src_info->ipi6_addr);\n" "-\n" - "-\t\t\tif (addr_type = IPV6_ADDR_ANY)\n" + "-\t\t\tif (addr_type == IPV6_ADDR_ANY)\n" "+\t\t\tif (ipv6_addr_any(&src_info->ipi6_addr))\n" " \t\t\t\tbreak;\n" "\n" @@ -191,7 +197,7 @@ "-\tint addr_type;\n" "\n" " \t/* Our own report looped back. Ignore it. */\n" - " \tif (skb->pkt_type = PACKET_LOOPBACK)\n" + " \tif (skb->pkt_type == PACKET_LOOPBACK)\n" "@@ -1303,9 +1302,8 @@ int igmp6_event_report(struct sk_buff *skb)\n" " \thdr = icmp6_hdr(skb);\n" "\n" @@ -278,7 +284,7 @@ "+\t ipv6_addr_scope_linklocal(&treq->rmt_addr))\n" " \t\ttreq->iif = inet6_iif(skb);\n" "\n" - " \tif (isn = 0)\n" + " \tif (isn == 0)\n" "diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c\n" "index bd2856f..c0b5fe3 100644\n" "--- a/net/ipv6/udp.c\n" @@ -377,4 +383,4 @@ "-- \n" 1.5.0.3 -58ca1820a8adc15bd1305f6fe6c195f30b3d00fdd9de06b4a5614ab41e79004a +26c07c2e54c1185913fbcee263aa0dcc0d978d305904e6290b21ef5622f5b27d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.