summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorEliezer Tamir <eliezer.tamir@linux.intel.com>2013-06-14 16:33:25 +0300
committerDavid S. Miller <davem@davemloft.net>2013-06-17 15:48:13 -0700
commiteb6db622825b2028df74f490b8c36887cf3c2f50 (patch)
tree495d07236545de66e4bff75a0e8e630bcfeea1ed /include/net
parent2e0c9e7911465b29daf85f7de97949004bf7b31c (diff)
downloadlinux-eb6db622825b2028df74f490b8c36887cf3c2f50.tar.bz2
net: change sysctl_net_ll_poll into an unsigned int
There is no reason for sysctl_net_ll_poll to be an unsigned long. Change it into an unsigned int. Fix the proc handler. Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ll_poll.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ll_poll.h b/include/net/ll_poll.h
index bc262f88173f..44e2f707cb9f 100644
--- a/include/net/ll_poll.h
+++ b/include/net/ll_poll.h
@@ -34,7 +34,7 @@
#ifdef CONFIG_NET_LL_RX_POLL
struct napi_struct;
-extern unsigned long sysctl_net_ll_poll __read_mostly;
+extern unsigned int sysctl_net_ll_poll __read_mostly;
/* return values from ndo_ll_poll */
#define LL_FLUSH_FAILED -1
@@ -45,7 +45,8 @@ extern unsigned long sysctl_net_ll_poll __read_mostly;
static inline cycles_t ll_end_time(void)
{
- return TSC_MHZ * ACCESS_ONCE(sysctl_net_ll_poll) + get_cycles();
+ return (cycles_t)TSC_MHZ * ACCESS_ONCE(sysctl_net_ll_poll)
+ + get_cycles();
}
static inline bool sk_valid_ll(struct sock *sk)