From bc78db11f713919e6166adc73016174e54699a97 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 24 Jan 2008 00:15:42 -0800 Subject: [PATCH] --- yaml --- r: 78673 b: refs/heads/master c: 74feb6e84e189707ca1324a92f7206617efbd735 h: refs/heads/master i: 78671: d46b592d11100e8d2b14b5220734bbfb0b4d9196 v: v3 --- [refs] | 2 +- trunk/net/ipv4/icmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2dcf2e3ca4f7..fcd66b4e6cb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65f7651788e18fadb2fbb7276af935d7871e1803 +refs/heads/master: 74feb6e84e189707ca1324a92f7206617efbd735 diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index ce5b4be559aa..1a6024978e28 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -232,7 +232,7 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1]; static DEFINE_PER_CPU(struct socket *, __icmp_socket) = NULL; #define icmp_socket __get_cpu_var(__icmp_socket) -static __inline__ int icmp_xmit_lock(void) +static inline int icmp_xmit_lock(void) { local_bh_disable(); @@ -246,7 +246,7 @@ static __inline__ int icmp_xmit_lock(void) return 0; } -static void icmp_xmit_unlock(void) +static inline void icmp_xmit_unlock(void) { spin_unlock_bh(&icmp_socket->sk->sk_lock.slock); }