1 files changed, 5 insertions, 7 deletions

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 37a1ecd9d600..cd975743bcd2 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -5,8 +5,6 @@
  *
  *              RAW - implementation of IP "raw" sockets.
  *
- * Version:     $Id: raw.c,v 1.64 2002/02/01 22:01:04 davem Exp $
- *
  * Authors:     Ross Biro
  *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *
@@ -322,6 +320,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
                         unsigned int flags)
 {
         struct inet_sock *inet = inet_sk(sk);
+        struct net *net = sock_net(sk);
         struct iphdr *iph;
         struct sk_buff *skb;
         unsigned int iphlen;
@@ -370,7 +369,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
                 iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
         }
         if (iph->protocol == IPPROTO_ICMP)
-                icmp_out_count(((struct icmphdr *)
+                icmp_out_count(net, ((struct icmphdr *)
                         skb_transport_header(skb))->type);
 
         err = NF_HOOK(PF_INET, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
@@ -386,7 +385,7 @@ error_fault:
         err = -EFAULT;
         kfree_skb(skb);
 error:
-        IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
+        IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);
         return err;
 }
 
@@ -608,12 +607,11 @@ static void raw_close(struct sock *sk, long timeout)
         sk_common_release(sk);
 }
 
-static int raw_destroy(struct sock *sk)
+static void raw_destroy(struct sock *sk)
 {
         lock_sock(sk);
         ip_flush_pending_frames(sk);
         release_sock(sk);
-        return 0;
 }
 
 /* This gets rid of all the nasties in af_inet. -DaveM */
@@ -947,7 +945,7 @@ static int raw_seq_show(struct seq_file *seq, void *v)
         if (v == SEQ_START_TOKEN)
                 seq_printf(seq, "  sl  local_address rem_address   st tx_queue "
                                 "rx_queue tr tm->when retrnsmt   uid  timeout "
-                                "inode  drops\n");
+                                "inode ref pointer drops\n");
         else
                 raw_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
         return 0;