summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2012-10-09 17:48:19 +0000
committerDavid S. Miller <davem@davemloft.net>2012-10-10 22:33:30 -0400
commit4c139b8ccebaecdfad58eb068d61ef386f1a58ed (patch)
treef21b439a3348114f3be4434f40f9236375b4ee75 /net
parent0373a94671be1f5c823dbfc03617418d8effd5ce (diff)
downloadlinux-3.10-4c139b8ccebaecdfad58eb068d61ef386f1a58ed.tar.gz
linux-3.10-4c139b8ccebaecdfad58eb068d61ef386f1a58ed.tar.bz2
linux-3.10-4c139b8ccebaecdfad58eb068d61ef386f1a58ed.zip
pktgen: enable automatic IPv6 address setting
Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/pktgen.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index f9b4637e9f2..47fe18e6a8e 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2037,6 +2037,9 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, ETH_ALEN);
if (pkt_dev->flags & F_IPV6) {
+ int i, set = 0, err = 1;
+ struct inet6_dev *idev;
+
if (pkt_dev->min_pkt_size == 0) {
pkt_dev->min_pkt_size = 14 + sizeof(struct ipv6hdr)
+ sizeof(struct udphdr)
@@ -2044,15 +2047,6 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
+ pkt_dev->pkt_overhead;
}
- /*
- * Skip this automatic address setting until locks or functions
- * gets exported
- */
-
-#ifdef NOTNOW
- int i, set = 0, err = 1;
- struct inet6_dev *idev;
-
for (i = 0; i < IN6_ADDR_HSIZE; i++)
if (pkt_dev->cur_in6_saddr.s6_addr[i]) {
set = 1;
@@ -2073,9 +2067,8 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
struct inet6_ifaddr *ifp;
read_lock_bh(&idev->lock);
- for (ifp = idev->addr_list; ifp;
- ifp = ifp->if_next) {
- if (ifp->scope == IFA_LINK &&
+ list_for_each_entry(ifp, &idev->addr_list, if_list) {
+ if ((ifp->scope & IFA_LINK) &&
!(ifp->flags & IFA_F_TENTATIVE)) {
pkt_dev->cur_in6_saddr = ifp->addr;
err = 0;
@@ -2088,7 +2081,6 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
if (err)
pr_err("ERROR: IPv6 link address not available\n");
}
-#endif
} else {
if (pkt_dev->min_pkt_size == 0) {
pkt_dev->min_pkt_size = 14 + sizeof(struct iphdr)