diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-12 19:19:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-12 19:19:46 -0700 |
| commit | 6fb9114e4bc4b9144306bc2c64abd18b364409d7 (patch) | |
| tree | a9e58416c5f77cd0764331ba81833f2313e07bb7 /net/ipv6/sit.c | |
| parent | 03e1ad7b5d871d4189b1da3125c2f12d1b5f7d0b (diff) | |
| parent | 05f175cdcf9d3615c1633615d87891ebfb729401 (diff) | |
Merge branch 'net-2.6.26-misc-20080412b' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index cc16fe07bbf..91e46fbe6ce 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -379,7 +379,7 @@ static void ipip6_tunnel_uninit(struct net_device *dev) dev_put(dev); } else { ipip6_tunnel_unlink(netdev_priv(dev)); - ipip6_tunnel_del_prl(netdev_priv(dev), 0); + ipip6_tunnel_del_prl(netdev_priv(dev), NULL); dev_put(dev); } } |