git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
[pandora-kernel.git]
/
net
/
netfilter
/
ipvs
/
ip_vs_conn.c
diff --git
a/net/netfilter/ipvs/ip_vs_conn.c
b/net/netfilter/ipvs/ip_vs_conn.c
index
5092505
..
bf28ac2
100644
(file)
--- a/
net/netfilter/ipvs/ip_vs_conn.c
+++ b/
net/netfilter/ipvs/ip_vs_conn.c
@@
-595,7
+595,7
@@
ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
atomic_inc(&dest->inactconns);
} else {
/* It is a persistent connection/template, so increase
atomic_inc(&dest->inactconns);
} else {
/* It is a persistent connection/template, so increase
- the peristent connection counter */
+ the per
s
istent connection counter */
atomic_inc(&dest->persistconns);
}
atomic_inc(&dest->persistconns);
}
@@
-657,7
+657,7
@@
static inline void ip_vs_unbind_dest(struct ip_vs_conn *cp)
}
} else {
/* It is a persistent connection/template, so decrease
}
} else {
/* It is a persistent connection/template, so decrease
- the peristent connection counter */
+ the per
s
istent connection counter */
atomic_dec(&dest->persistconns);
}
atomic_dec(&dest->persistconns);
}
@@
-1046,7
+1046,7
@@
static const struct file_operations ip_vs_conn_fops = {
.open = ip_vs_conn_open,
.read = seq_read,
.llseek = seq_lseek,
.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)
};
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,
.open = ip_vs_conn_sync_open,
.read = seq_read,
.llseek = seq_lseek,
- .release = seq_release,
+ .release = seq_release
_net
,
};
#endif
};
#endif