aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-04 16:26:49 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-04 16:26:49 -0400
commit45efebf2492187e8915e2876c5bf6f3803b1c23f (patch)
treefef7ca620be5a61a243e7781bf50cb829972e4ca /net/ipv4/udp.c
parent4acbab84688bfea82322c14e809fc7d82242cee3 (diff)
parent6e1d91039becc9d5bcd046d8c709dbaf471220e3 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl [IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP [NET] gso: Fix GSO feature mask in sk_setup_caps [TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules) [NET]: Fix comparisons of unsigned < 0. [NET]: Make net watchdog timers 1 sec jiffy aligned. [ATM]: Fix warning. [TCP]: Use default 32768-61000 outgoing port range in all cases. [AF_UNIX]: Fix datagram connect race causing an OOPS. [TG3]: Fix link problem on Dell's onboard 5906. [AF_UNIX]: Make socket locking much less confusing.
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r--net/ipv4/udp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 4c7e95fa090d..5da703e699da 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -722,8 +722,11 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
722 .dport = dport } } }; 722 .dport = dport } } };
723 security_sk_classify_flow(sk, &fl); 723 security_sk_classify_flow(sk, &fl);
724 err = ip_route_output_flow(&rt, &fl, sk, 1); 724 err = ip_route_output_flow(&rt, &fl, sk, 1);
725 if (err) 725 if (err) {
726 if (err == -ENETUNREACH)
727 IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
726 goto out; 728 goto out;
729 }
727 730
728 err = -EACCES; 731 err = -EACCES;
729 if ((rt->rt_flags & RTCF_BROADCAST) && 732 if ((rt->rt_flags & RTCF_BROADCAST) &&