git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
ipv4
/
ipvs
/
ip_vs_lblcr.c
diff --git
a/net/ipv4/ipvs/ip_vs_lblcr.c
b/net/ipv4/ipvs/ip_vs_lblcr.c
index
32ba37b
..
fe1af5d
100644
(file)
--- a/
net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/
net/ipv4/ipvs/ip_vs_lblcr.c
@@
-43,6
+43,7
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
+#include <linux/jiffies.h>
/* for sysctl */
#include <linux/fs.h>
/* for sysctl */
#include <linux/fs.h>
@@
-276,7
+277,7
@@
static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set)
*/
struct ip_vs_lblcr_entry {
struct list_head list;
*/
struct ip_vs_lblcr_entry {
struct list_head list;
- __
u
32 addr; /* destination IP address */
+ __
be
32 addr; /* destination IP address */
struct ip_vs_dest_set set; /* destination server set */
unsigned long lastuse; /* last used time */
};
struct ip_vs_dest_set set; /* destination server set */
unsigned long lastuse; /* last used time */
};
@@
-348,7
+349,7
@@
static struct ctl_table_header * sysctl_header;
* new/free a ip_vs_lblcr_entry, which is a mapping of a destination
* IP address to a server.
*/
* new/free a ip_vs_lblcr_entry, which is a mapping of a destination
* IP address to a server.
*/
-static inline struct ip_vs_lblcr_entry *ip_vs_lblcr_new(__
u
32 daddr)
+static inline struct ip_vs_lblcr_entry *ip_vs_lblcr_new(__
be
32 daddr)
{
struct ip_vs_lblcr_entry *en;
{
struct ip_vs_lblcr_entry *en;
@@
-381,7
+382,7
@@
static inline void ip_vs_lblcr_free(struct ip_vs_lblcr_entry *en)
/*
* Returns hash value for IPVS LBLCR entry
*/
/*
* Returns hash value for IPVS LBLCR entry
*/
-static inline unsigned ip_vs_lblcr_hashkey(__
u
32 addr)
+static inline unsigned ip_vs_lblcr_hashkey(__
be
32 addr)
{
return (ntohl(addr)*2654435761UL) & IP_VS_LBLCR_TAB_MASK;
}
{
return (ntohl(addr)*2654435761UL) & IP_VS_LBLCR_TAB_MASK;
}
@@
-420,7
+421,7
@@
ip_vs_lblcr_hash(struct ip_vs_lblcr_table *tbl, struct ip_vs_lblcr_entry *en)
* Get ip_vs_lblcr_entry associated with supplied parameters.
*/
static inline struct ip_vs_lblcr_entry *
* Get ip_vs_lblcr_entry associated with supplied parameters.
*/
static inline struct ip_vs_lblcr_entry *
-ip_vs_lblcr_get(struct ip_vs_lblcr_table *tbl, __
u
32 addr)
+ip_vs_lblcr_get(struct ip_vs_lblcr_table *tbl, __
be
32 addr)
{
unsigned hash;
struct ip_vs_lblcr_entry *en;
{
unsigned hash;
struct ip_vs_lblcr_entry *en;