From a3a814e2628392230d209517ddb8da2e4822af13 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Thu, 31 Jan 2008 03:48:55 -0800
Subject: [PATCH] --- yaml --- r: 81880 b: refs/heads/master c:
 3046d76746311ac7ff0cdc3ec42db15730528dbf h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/include/net/raw.h | 3 ++-
 trunk/net/ipv4/raw.c    | 8 ++++----
 trunk/net/ipv6/raw.c    | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index dbbfaf1a3fed..6aba9a4e2c72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cd850efa4948d57a2ed836911cfd1ab299e89c6
+refs/heads/master: 3046d76746311ac7ff0cdc3ec42db15730528dbf
diff --git a/trunk/include/net/raw.h b/trunk/include/net/raw.h
index c7ea7a2aca86..1828f81fe374 100644
--- a/trunk/include/net/raw.h
+++ b/trunk/include/net/raw.h
@@ -48,7 +48,8 @@ struct raw_iter_state {
 void *raw_seq_start(struct seq_file *seq, loff_t *pos);
 void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);
 void raw_seq_stop(struct seq_file *seq, void *v);
-int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h);
+int raw_seq_open(struct inode *ino, struct file *file,
+		 struct raw_hashinfo *h, const struct seq_operations *ops);
 
 #endif
 
diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c
index 830f19e2fce9..a3002fe65b7f 100644
--- a/trunk/net/ipv4/raw.c
+++ b/trunk/net/ipv4/raw.c
@@ -962,13 +962,13 @@ static const struct seq_operations raw_seq_ops = {
 	.show  = raw_seq_show,
 };
 
-int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h)
+int raw_seq_open(struct inode *ino, struct file *file,
+		 struct raw_hashinfo *h, const struct seq_operations *ops)
 {
 	int err;
 	struct raw_iter_state *i;
 
-	err = seq_open_net(ino, file, &raw_seq_ops,
-			sizeof(struct raw_iter_state));
+	err = seq_open_net(ino, file, ops, sizeof(struct raw_iter_state));
 	if (err < 0)
 		return err;
 
@@ -980,7 +980,7 @@ EXPORT_SYMBOL_GPL(raw_seq_open);
 
 static int raw_v4_seq_open(struct inode *inode, struct file *file)
 {
-	return raw_seq_open(inode, file, &raw_v4_hashinfo);
+	return raw_seq_open(inode, file, &raw_v4_hashinfo, &raw_seq_ops);
 }
 
 static const struct file_operations raw_seq_fops = {
diff --git a/trunk/net/ipv6/raw.c b/trunk/net/ipv6/raw.c
index a2cf49911ffd..8897ccf8086a 100644
--- a/trunk/net/ipv6/raw.c
+++ b/trunk/net/ipv6/raw.c
@@ -1262,7 +1262,7 @@ static const struct seq_operations raw6_seq_ops = {
 
 static int raw6_seq_open(struct inode *inode, struct file *file)
 {
-	return raw_seq_open(inode, file, &raw_v6_hashinfo);
+	return raw_seq_open(inode, file, &raw_v6_hashinfo, &raw6_seq_ops);
 }
 
 static const struct file_operations raw6_seq_fops = {