summaryrefslogtreecommitdiff
path: root/net/ipv4/raw.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-05 09:12:41 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-05 09:12:41 +0200
commit09f68072b32089f2e3b4749161eb3ce954faf8d4 (patch)
treeb8b3c84f8a9c7150c2d830428daa3d641917ecf3 /net/ipv4/raw.c
parentd454f39f3ff3ee5a818c271026081a48a537bd41 (diff)
parentef49e4fae3f364af8da041dcc1bb4931c749b3da (diff)
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'net/ipv4/raw.c')
-rw-r--r--net/ipv4/raw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index e837ffd3edc3..2d3c72e5bbbf 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -569,6 +569,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
+ rt = NULL;
goto done;
}
}