diff --git a/[refs] b/[refs] index 975a6431b98f..a379732d513f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56e252c7484c3ebc058f3c22d4a75386b079c49c +refs/heads/master: 6db105db95197c0fe93f8b3fb338eb6cf17440b7 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index ebfb1268ac3c..d18fdb102360 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -405,7 +405,7 @@ static inline __u64 tv_to_us(const struct timeval *tv) return us; } -static inline __u64 getCurUs(void) +static __u64 getCurUs(void) { struct timeval tv; do_gettimeofday(&tv);