projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git]
/
net
/
ipv4
/
xfrm4_mode_tunnel.c
diff --git
a/net/ipv4/xfrm4_mode_tunnel.c
b/net/ipv4/xfrm4_mode_tunnel.c
index
f8d880b
..
e23c21d
100644
(file)
--- a/
net/ipv4/xfrm4_mode_tunnel.c
+++ b/
net/ipv4/xfrm4_mode_tunnel.c
@@
-33,10
+33,9
@@
static inline void ipip_ecn_decapsulate(struct sk_buff *skb)
* On exit, skb->h will be set to the start of the payload to be processed
* by x->type->output and skb->nh will be set to the top IP header.
*/
* On exit, skb->h will be set to the start of the payload to be processed
* by x->type->output and skb->nh will be set to the top IP header.
*/
-static int xfrm4_tunnel_output(struct sk_buff *skb)
+static int xfrm4_tunnel_output(struct
xfrm_state *x, struct
sk_buff *skb)
{
struct dst_entry *dst = skb->dst;
{
struct dst_entry *dst = skb->dst;
- struct xfrm_state *x = dst->xfrm;
struct iphdr *iph, *top_iph;
int flags;
struct iphdr *iph, *top_iph;
int flags;
@@
-92,7
+91,6
@@
static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
skb->mac.raw = memmove(skb->data - skb->mac_len,
skb->mac.raw, skb->mac_len);
skb->nh.raw = skb->data;
skb->mac.raw = memmove(skb->data - skb->mac_len,
skb->mac.raw, skb->mac_len);
skb->nh.raw = skb->data;
- memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
err = 0;
out:
err = 0;
out: