diff options
| author | Oliver Hartkopp <oliver@hartkopp.net> | 2008-07-23 23:06:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-23 23:06:04 +0200 |
| commit | b4942af65028c5eb516fdd9053020ccb2ee186ce (patch) | |
| tree | c1dbedc282777c599abf430dbd591edd1380dcab /net | |
| parent | netdev: Remove warning from __netif_schedule(). (diff) | |
| download | linux-b4942af65028c5eb516fdd9053020ccb2ee186ce.tar.xz linux-b4942af65028c5eb516fdd9053020ccb2ee186ce.zip | |
net: Update entry in af_family_clock_key_strings
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 10a64d57078c..91f8bbc93526 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" }; |