ipv4: replace dst_metric() with dst_mtu() in net/ipv4/route.c.

[linux-2.6] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 456777d7a4076e5b1e79f994c055c968f179c383..01d47674f7e5c802214565108e14a820ef7963fc 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1157,7 +1157,7 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg)
 static void rawv6_close(struct sock *sk, long timeout)
 {
        if (inet_sk(sk)->num == IPPROTO_RAW)
-               ip6_ra_control(sk, -1, NULL);
+               ip6_ra_control(sk, -1);
        ip6mr_sk_done(sk);
        sk_common_release(sk);
 }
@@ -1251,7 +1251,7 @@ static int raw6_seq_show(struct seq_file *seq, void *v)
                           "local_address                         "
                           "remote_address                        "
                           "st tx_queue rx_queue tr tm->when retrnsmt"
-                          "   uid  timeout inode  drops\n");
+                          "   uid  timeout inode ref pointer drops\n");
        else
                raw6_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
        return 0;