[PATCH] net: Update entry in af_family_clock_key_strings

[PATCH] net: Update entry in af_family_clock_key_strings

[Oliver Hartkopp]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

In the merge phase of the CAN subsystem the 
af_family_clock_key_strings[] have been added to sock.c in commit 
443aef0eddfa44c158d1b94ebb431a70638fcab4 
(lockdep: fixup sk_callback_lock annotation). This trivial patch adds 
the missing name for address family 29 (AF_CAN).

Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>
Cc: Urs Thuermann <urs@isnogud.escape.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>

---



[-- Attachment #2: sock-AF_CAN-clock-key-string.patch --]
[-- Type: text/x-patch, Size: 639 bytes --]

diff --git a/net/core/sock.c b/net/core/sock.c
index 10a64d5..91f8bbc 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -180,7 +180,7 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = {
   "clock-AF_ASH"   , "clock-AF_ECONET"   , "clock-AF_ATMSVC"   ,
   "clock-21"       , "clock-AF_SNA"      , "clock-AF_IRDA"     ,
   "clock-AF_PPPOX" , "clock-AF_WANPIPE"  , "clock-AF_LLC"      ,
-  "clock-27"       , "clock-28"          , "clock-29"          ,
+  "clock-27"       , "clock-28"          , "clock-AF_CAN"      ,
   "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,
   "clock-AF_RXRPC" , "clock-AF_MAX"
 };

Re: [PATCH] net: Update entry in af_family_clock_key_strings

[David Miller]

From: Oliver Hartkopp <oliver@hartkopp.net>
Date: Wed, 23 Jul 2008 22:28:58 +0200

> In the merge phase of the CAN subsystem the 
> af_family_clock_key_strings[] have been added to sock.c in commit 
> 443aef0eddfa44c158d1b94ebb431a70638fcab4 
> (lockdep: fixup sk_callback_lock annotation). This trivial patch adds 
> the missing name for address family 29 (AF_CAN).
> 
> Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>

Applied, thanks Oliver.