Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e3d32c3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

parents cb685528 0f08190f

net/netfilter/ipvs/ip_vs_app.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static const struct file_operations ip_vs_app_fops = { 
	.open	 = ip_vs_app_open,

	.read	 = seq_read,

	.llseek  = seq_lseek,

	.release = seq_release,

	.release = seq_release_net,

};

#endif

net/netfilter/ipvs/ip_vs_conn.c

+2 −2
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ static const struct file_operations ip_vs_conn_fops = { 
	.open    = ip_vs_conn_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.release = seq_release,

	.release = seq_release_net,

};



static const char *ip_vs_origin_name(unsigned flags)
@@ -1114,7 +1114,7 @@ static const struct file_operations ip_vs_conn_sync_fops = { 
	.open    = ip_vs_conn_sync_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.release = seq_release,

	.release = seq_release_net,

};



#endif

net/netfilter/ipvs/ip_vs_ctl.c

+3 −3
Original line number Diff line number Diff line
@@ -2066,7 +2066,7 @@ static const struct file_operations ip_vs_info_fops = { 
	.open    = ip_vs_info_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.release = seq_release_private,

	.release = seq_release_net,

};



#endif
@@ -2109,7 +2109,7 @@ static const struct file_operations ip_vs_stats_fops = { 
	.open = ip_vs_stats_seq_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

	.release = single_release_net,

};



static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)
@@ -2178,7 +2178,7 @@ static const struct file_operations ip_vs_stats_percpu_fops = { 
	.open = ip_vs_stats_percpu_seq_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

	.release = single_release_net,

};

#endif