diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /net/ipv4/ip_gre.c | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index f0d5740d7e22..896ce3f8f53a 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -1104,10 +1104,10 @@ static int ipgre_open(struct net_device *dev) | |||
| 1104 | return -EADDRNOTAVAIL; | 1104 | return -EADDRNOTAVAIL; |
| 1105 | dev = rt->u.dst.dev; | 1105 | dev = rt->u.dst.dev; |
| 1106 | ip_rt_put(rt); | 1106 | ip_rt_put(rt); |
| 1107 | if (__in_dev_get(dev) == NULL) | 1107 | if (__in_dev_get_rtnl(dev) == NULL) |
| 1108 | return -EADDRNOTAVAIL; | 1108 | return -EADDRNOTAVAIL; |
| 1109 | t->mlink = dev->ifindex; | 1109 | t->mlink = dev->ifindex; |
| 1110 | ip_mc_inc_group(__in_dev_get(dev), t->parms.iph.daddr); | 1110 | ip_mc_inc_group(__in_dev_get_rtnl(dev), t->parms.iph.daddr); |
| 1111 | } | 1111 | } |
| 1112 | return 0; | 1112 | return 0; |
| 1113 | } | 1113 | } |