From f8e70817fe69ac5b51a459b57f7de8768fd66cc5 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Tue, 16 Mar 2010 06:46:31 +0000 Subject: [PATCH] --- yaml --- r: 188151 b: refs/heads/master c: 3feec9095d12e311b7d4eb7fe7e5dfa75d4a72a5 h: refs/heads/master i: 188149: 25bc7156cd26d644e8d0ec5c647dcda452533e80 188147: 5fef22706cc8f54970d9701e8081766b38cbda18 188143: e40e02007abe3c6abfffd72626bd89cb27ffb6af v: v3 --- [refs] | 2 +- trunk/drivers/net/pppol2tp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3bf94670cdae..5201efa3d08f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0cad871703b898a442e4049c532ec39168e5b57 +refs/heads/master: 3feec9095d12e311b7d4eb7fe7e5dfa75d4a72a5 diff --git a/trunk/drivers/net/pppol2tp.c b/trunk/drivers/net/pppol2tp.c index 9fbb2eba9a06..5861ee9599a2 100644 --- a/trunk/drivers/net/pppol2tp.c +++ b/trunk/drivers/net/pppol2tp.c @@ -1180,7 +1180,8 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb) /* Calculate UDP checksum if configured to do so */ if (sk_tun->sk_no_check == UDP_CSUM_NOXMIT) skb->ip_summed = CHECKSUM_NONE; - else if (!(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM)) { + else if ((skb_dst(skb) && skb_dst(skb)->dev) && + (!(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM))) { skb->ip_summed = CHECKSUM_COMPLETE; csum = skb_checksum(skb, 0, udp_len, 0); uh->check = csum_tcpudp_magic(inet->inet_saddr,