diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /net/ipv4/ip_gre.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
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 | } |