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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
ipv4
/
ipvs
/
ip_vs_proto.c
diff --git
a/net/ipv4/ipvs/ip_vs_proto.c
b/net/ipv4/ipvs/ip_vs_proto.c
index
867d4e9
..
e844ddb
100644
(file)
--- a/
net/ipv4/ipvs/ip_vs_proto.c
+++ b/
net/ipv4/ipvs/ip_vs_proto.c
@@
-118,13
+118,7
@@
void ip_vs_protocol_timeout_change(int flags)
int *
ip_vs_create_timeout_table(int *table, int size)
{
int *
ip_vs_create_timeout_table(int *table, int size)
{
- int *t;
-
- t = kmalloc(size, GFP_ATOMIC);
- if (t == NULL)
- return NULL;
- memcpy(t, table, size);
- return t;
+ return kmemdup(table, size, GFP_ATOMIC);
}
}
@@
-176,7
+170,7
@@
ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp,
pp->name, NIPQUAD(ih->saddr),
NIPQUAD(ih->daddr));
else {
pp->name, NIPQUAD(ih->saddr),
NIPQUAD(ih->daddr));
else {
- __
u
16 _ports[2], *pptr
+ __
be
16 _ports[2], *pptr
;
pptr = skb_header_pointer(skb, offset + ih->ihl*4,
sizeof(_ports), _ports);
;
pptr = skb_header_pointer(skb, offset + ih->ihl*4,
sizeof(_ports), _ports);