Skip to content
Browse files

Fixed implemnation of fls function. It is already available on 64-bit…

… linux prior to 2.6.24, so should not be compiled for 64-bit
  • Loading branch information...
1 parent e991767 commit c2d5d61eb262381da758abfb299895c4965f83f9 Russ Lankenau committed Jun 5, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 dummynet2/missing.h
View
6 dummynet2/missing.h
@@ -481,9 +481,10 @@ struct sock *tcp_v4_lookup(u32 saddr, u16 sport, u32 daddr, u16 dport, int dif);
//module_param(_name, _ty, 0644)
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
typedef unsigned long uintptr_t;
+#if !defined(__LP64__)
#ifdef MIPSEL
static inline unsigned long __fls (unsigned long word)
{
@@ -498,8 +499,9 @@ static inline unsigned long __fls(unsigned long word)
return word;
}
#endif
+#endif /* !__LP64__ */
-#endif /* LINUX < 2.6.25 */
+#endif /* LINUX < 2.6.24 */
#endif /* !_WIN32 so maybe __linux__ */

0 comments on commit c2d5d61

Please sign in to comment.
Something went wrong with that request. Please try again.