From: Oliver Hartkopp <oliver@hartkopp.net>
To: David Miller <davem@davemloft.net>
Cc: Urs Thuermann <urs@isnogud.escape.de>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Linux Netdev List <netdev@vger.kernel.org>
Subject: [PATCH] net: Update entry in af_family_clock_key_strings
Date: Wed, 23 Jul 2008 22:28:58 +0200 [thread overview]
Message-ID: <4887948A.6030304@hartkopp.net> (raw)
[-- 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"
};
next reply other threads:[~2008-07-23 20:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 20:28 Oliver Hartkopp [this message]
2008-07-23 21:06 ` [PATCH] net: Update entry in af_family_clock_key_strings David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4887948A.6030304@hartkopp.net \
--to=oliver@hartkopp.net \
--cc=a.p.zijlstra@chello.nl \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=urs@isnogud.escape.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.