diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-12 09:47:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-12 09:47:01 -0500 |
| commit | f811b436522d3b9c05302f1785aba61829938a54 (patch) | |
| tree | 397034c602b8b7ef3982b76193bb63c13583d985 /net/core | |
| parent | 038c35a86d213c69faf7aa9500ab9001c3774e15 (diff) | |
| parent | 143c017108f8a695e4e1c1f5ec57ee89be9cad70 (diff) | |
Merge branch 'smc-fixes'
Ursula Braun says:
====================
net/smc: fix typo and clc-bug
I received 2 bug reports for my new AF_SMC-code. Here are the fixes for them.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -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 dbbdc4f16789..8b35debfe454 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -256,7 +256,7 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = { "clock-AF_RXRPC" , "clock-AF_ISDN" , "clock-AF_PHONET" , "clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG" , "clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_KCM" , - "clock-AF_QIPCRTR", "closck-AF_smc" , "clock-AF_MAX" + "clock-AF_QIPCRTR", "clock-AF_SMC" , "clock-AF_MAX" }; /* |