Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / net / ipv4 / xfrm4_tunnel.c

diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c
index f110af5b1319f0968a4278283cdaa171761d6e75..1be6762b2d474fd42d399e6accfdae30f9ff8b2e 100644 (file)
--- a/net/ipv4/xfrm4_tunnel.c
+++ b/net/ipv4/xfrm4_tunnel.c
@@ -13,7 +13,7 @@
 static int ipip_output(struct xfrm_state *x, struct sk_buff *skb)
 {
        struct iphdr *iph;
-       
+
        iph = skb->nh.iph;
        iph->tot_len = htons(skb->len);
        ip_send_check(iph);