projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-2.6' into for-2.6.22
[powerpc.git]
/
net
/
ipv4
/
xfrm4_output.c
diff --git
a/net/ipv4/xfrm4_output.c
b/net/ipv4/xfrm4_output.c
index
038ca16
..
44ef208
100644
(file)
--- a/
net/ipv4/xfrm4_output.c
+++ b/
net/ipv4/xfrm4_output.c
@@
-22,14
+22,13
@@
static int xfrm4_tunnel_check_size(struct sk_buff *skb)
{
int mtu, ret = 0;
struct dst_entry *dst;
{
int mtu, ret = 0;
struct dst_entry *dst;
- struct iphdr *iph = skb->nh.iph;
if (IPCB(skb)->flags & IPSKB_XFRM_TUNNEL_SIZE)
goto out;
IPCB(skb)->flags |= IPSKB_XFRM_TUNNEL_SIZE;
if (IPCB(skb)->flags & IPSKB_XFRM_TUNNEL_SIZE)
goto out;
IPCB(skb)->flags |= IPSKB_XFRM_TUNNEL_SIZE;
- if (!(ip
h
->frag_off & htons(IP_DF)) || skb->local_df)
+ if (!(ip
_hdr(skb)
->frag_off & htons(IP_DF)) || skb->local_df)
goto out;
dst = skb->dst;
goto out;
dst = skb->dst;