diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/pktgen.c | 2 | ||||
-rw-r--r-- | net/ipv6/ip6_output.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 975d651312dc..8eb083b6041a 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -363,7 +363,7 @@ struct pktgen_thread { | |||
363 | * All Rights Reserved. | 363 | * All Rights Reserved. |
364 | * | 364 | * |
365 | */ | 365 | */ |
366 | inline static s64 divremdi3(s64 x, s64 y, int type) | 366 | static inline s64 divremdi3(s64 x, s64 y, int type) |
367 | { | 367 | { |
368 | u64 a = (x < 0) ? -x : x; | 368 | u64 a = (x < 0) ? -x : x; |
369 | u64 b = (y < 0) ? -y : y; | 369 | u64 b = (y < 0) ? -y : y; |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 1f2c2f9e353f..ae652ca14bc9 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -792,13 +792,8 @@ int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl) | |||
792 | if (ipv6_addr_any(&fl->fl6_src)) { | 792 | if (ipv6_addr_any(&fl->fl6_src)) { |
793 | err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src); | 793 | err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src); |
794 | 794 | ||
795 | if (err) { | 795 | if (err) |
796 | #if IP6_DEBUG >= 2 | ||
797 | printk(KERN_DEBUG "ip6_dst_lookup: " | ||
798 | "no available source address\n"); | ||
799 | #endif | ||
800 | goto out_err_release; | 796 | goto out_err_release; |
801 | } | ||
802 | } | 797 | } |
803 | 798 | ||
804 | return 0; | 799 | return 0; |