projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TCP_IPV4]: Use kmemdup where appropriate
[powerpc.git]
/
net
/
ipv4
/
xfrm4_input.c
diff --git
a/net/ipv4/xfrm4_input.c
b/net/ipv4/xfrm4_input.c
index
817ed84
..
8655d03
100644
(file)
--- a/
net/ipv4/xfrm4_input.c
+++ b/
net/ipv4/xfrm4_input.c
@@
-23,7
+23,7
@@
int xfrm4_rcv(struct sk_buff *skb)
EXPORT_SYMBOL(xfrm4_rcv);
EXPORT_SYMBOL(xfrm4_rcv);
-static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr,
u32 *spi, u
32 *seq)
+static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr,
__be32 *spi, __be
32 *seq)
{
switch (nexthdr) {
case IPPROTO_IPIP:
{
switch (nexthdr) {
case IPPROTO_IPIP:
@@
-55,7
+55,7
@@
drop:
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
{
int err;
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
{
int err;
-
u
32 spi, seq;
+
__be
32 spi, seq;
struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
struct xfrm_state *x;
int xfrm_nr = 0;
struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
struct xfrm_state *x;
int xfrm_nr = 0;
@@
-106,7
+106,7
@@
int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
if (x->mode->input(x, skb))
goto drop;
if (x->mode->input(x, skb))
goto drop;
- if (x->props.mode) {
+ if (x->props.mode
== XFRM_MODE_TUNNEL
) {
decaps = 1;
break;
}
decaps = 1;
break;
}