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_core.c
diff --git
a/net/ipv4/ipvs/ip_vs_core.c
b/net/ipv4/ipvs/ip_vs_core.c
index
f594635
..
3425752
100644
(file)
--- a/
net/ipv4/ipvs/ip_vs_core.c
+++ b/
net/ipv4/ipvs/ip_vs_core.c
@@
-209,14
+209,14
@@
int ip_vs_make_skb_writable(struct sk_buff **pskb, int writable_len)
static struct ip_vs_conn *
ip_vs_sched_persist(struct ip_vs_service *svc,
const struct sk_buff *skb,
static struct ip_vs_conn *
ip_vs_sched_persist(struct ip_vs_service *svc,
const struct sk_buff *skb,
- __
u
16 ports[2])
+ __
be
16 ports[2])
{
struct ip_vs_conn *cp = NULL;
struct iphdr *iph = skb->nh.iph;
struct ip_vs_dest *dest;
struct ip_vs_conn *ct;
{
struct ip_vs_conn *cp = NULL;
struct iphdr *iph = skb->nh.iph;
struct ip_vs_dest *dest;
struct ip_vs_conn *ct;
- __
u16 dport;
/* destination port to forward */
- __
u32 snet;
/* source network of the client, after masking */
+ __
be16 dport;
/* destination port to forward */
+ __
be32 snet;
/* source network of the client, after masking */
/* Mask saddr with the netmask to adjust template granularity */
snet = iph->saddr & svc->netmask;
/* Mask saddr with the netmask to adjust template granularity */
snet = iph->saddr & svc->netmask;
@@
-383,7
+383,7
@@
ip_vs_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
struct ip_vs_conn *cp = NULL;
struct iphdr *iph = skb->nh.iph;
struct ip_vs_dest *dest;
struct ip_vs_conn *cp = NULL;
struct iphdr *iph = skb->nh.iph;
struct ip_vs_dest *dest;
- __
u
16 _ports[2], *pptr;
+ __
be
16 _ports[2], *pptr;
pptr = skb_header_pointer(skb, iph->ihl*4,
sizeof(_ports), _ports);
pptr = skb_header_pointer(skb, iph->ihl*4,
sizeof(_ports), _ports);
@@
-446,7
+446,7
@@
ip_vs_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
struct ip_vs_protocol *pp)
{
int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
struct ip_vs_protocol *pp)
{
- __
u
16 _ports[2], *pptr;
+ __
be
16 _ports[2], *pptr;
struct iphdr *iph = skb->nh.iph;
pptr = skb_header_pointer(skb, iph->ihl*4,
struct iphdr *iph = skb->nh.iph;
pptr = skb_header_pointer(skb, iph->ihl*4,
@@
-536,9
+536,9
@@
static unsigned int ip_vs_post_routing(unsigned int hooknum,
return NF_STOP;
}
return NF_STOP;
}
-
u
16 ip_vs_checksum_complete(struct sk_buff *skb, int offset)
+
__sum
16 ip_vs_checksum_complete(struct sk_buff *skb, int offset)
{
{
- return
(u16)
csum_fold(skb_checksum(skb, offset, skb->len - offset, 0));
+ return csum_fold(skb_checksum(skb, offset, skb->len - offset, 0));
}
static inline struct sk_buff *
}
static inline struct sk_buff *
@@
-576,7
+576,7
@@
void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,
/* the TCP/UDP port */
if (IPPROTO_TCP == ciph->protocol || IPPROTO_UDP == ciph->protocol) {
/* the TCP/UDP port */
if (IPPROTO_TCP == ciph->protocol || IPPROTO_UDP == ciph->protocol) {
- __
u
16 *ports = (void *)ciph + ciph->ihl*4;
+ __
be
16 *ports = (void *)ciph + ciph->ihl*4;
if (inout)
ports[1] = cp->vport;
if (inout)
ports[1] = cp->vport;
@@
-775,7
+775,7
@@
ip_vs_out(unsigned int hooknum, struct sk_buff **pskb,
if (sysctl_ip_vs_nat_icmp_send &&
(pp->protocol == IPPROTO_TCP ||
pp->protocol == IPPROTO_UDP)) {
if (sysctl_ip_vs_nat_icmp_send &&
(pp->protocol == IPPROTO_TCP ||
pp->protocol == IPPROTO_UDP)) {
- __
u
16 _ports[2], *pptr;
+ __
be
16 _ports[2], *pptr;
pptr = skb_header_pointer(skb, ihl,
sizeof(_ports), _ports);
pptr = skb_header_pointer(skb, ihl,
sizeof(_ports), _ports);