* [PATCH net-next] net: add the AF_KCM entries to family name tables
@ 2016-04-05 14:41 Dexuan Cui
2016-04-06 10:46 ` Dexuan Cui
2016-04-06 20:59 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Dexuan Cui @ 2016-04-05 14:41 UTC (permalink / raw)
To: davem, netdev
This is for the recent kcm driver, which introduces AF_KCM(41) in
b7ac4eb(kcm: Kernel Connection Multiplexor module).
Signed-off-by: Dexuan Cui <decui@microsoft.com>
Cc: Signed-off-by: Tom Herbert <tom@herbertland.com>
---
net/core/sock.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index b67b9ae..7e73c26 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -221,7 +221,8 @@ static const char *const af_family_key_strings[AF_MAX+1] = {
"sk_lock-AF_TIPC" , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV" ,
"sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN" , "sk_lock-AF_PHONET" ,
"sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG" ,
- "sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_MAX"
+ "sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_KCM" ,
+ "sk_lock-AF_MAX"
};
static const char *const af_family_slock_key_strings[AF_MAX+1] = {
"slock-AF_UNSPEC", "slock-AF_UNIX" , "slock-AF_INET" ,
@@ -237,7 +238,8 @@ static const char *const af_family_slock_key_strings[AF_MAX+1] = {
"slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" ,
"slock-AF_RXRPC" , "slock-AF_ISDN" , "slock-AF_PHONET" ,
"slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG" ,
- "slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_MAX"
+ "slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_KCM" ,
+ "slock-AF_MAX"
};
static const char *const af_family_clock_key_strings[AF_MAX+1] = {
"clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
@@ -253,7 +255,8 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = {
"clock-AF_TIPC" , "clock-AF_BLUETOOTH", "clock-AF_IUCV" ,
"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_MAX"
+ "clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_KCM" ,
+ "clock-AF_MAX"
};
/*
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH net-next] net: add the AF_KCM entries to family name tables
2016-04-05 14:41 [PATCH net-next] net: add the AF_KCM entries to family name tables Dexuan Cui
@ 2016-04-06 10:46 ` Dexuan Cui
2016-04-06 20:59 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: Dexuan Cui @ 2016-04-06 10:46 UTC (permalink / raw)
To: David S. Miller, netdev@vger.kernel.org; +Cc: Tom Herbert
> From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
> On Behalf Of Dexuan Cui
> Sent: Tuesday, April 5, 2016 22:41
> To: davem@davemloft.net; netdev@vger.kernel.org
> Subject: [PATCH net-next] net: add the AF_KCM entries to family name tables
>
> This is for the recent kcm driver, which introduces AF_KCM(41) in
> b7ac4eb(kcm: Kernel Connection Multiplexor module).
>
> Signed-off-by: Dexuan Cui <decui@microsoft.com>
> Cc: Signed-off-by: Tom Herbert <tom@herbertland.com>
> ---
> net/core/sock.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/net/core/sock.c b/net/core/sock.c
> index b67b9ae..7e73c26 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -221,7 +221,8 @@ static const char *const
> af_family_key_strings[AF_MAX+1] = {
> "sk_lock-AF_TIPC" , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV" ,
> "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN" , "sk_lock-AF_PHONET" ,
> "sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG" ,
> - "sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_MAX"
> + "sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_KCM" ,
> + "sk_lock-AF_MAX"
> };
> static const char *const af_family_slock_key_strings[AF_MAX+1] = {
> "slock-AF_UNSPEC", "slock-AF_UNIX" , "slock-AF_INET" ,
> @@ -237,7 +238,8 @@ static const char *const
> af_family_slock_key_strings[AF_MAX+1] = {
> "slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" ,
> "slock-AF_RXRPC" , "slock-AF_ISDN" , "slock-AF_PHONET" ,
> "slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG" ,
> - "slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_MAX"
> + "slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_KCM" ,
> + "slock-AF_MAX"
> };
> static const char *const af_family_clock_key_strings[AF_MAX+1] = {
> "clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
> @@ -253,7 +255,8 @@ static const char *const
> af_family_clock_key_strings[AF_MAX+1] = {
> "clock-AF_TIPC" , "clock-AF_BLUETOOTH", "clock-AF_IUCV" ,
> "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_MAX"
> + "clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_KCM" ,
> + "clock-AF_MAX"
> };
>
> /*
Added Tom to Cc.
Thanks,
-- Dexuan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: add the AF_KCM entries to family name tables
2016-04-05 14:41 [PATCH net-next] net: add the AF_KCM entries to family name tables Dexuan Cui
2016-04-06 10:46 ` Dexuan Cui
@ 2016-04-06 20:59 ` David Miller
2016-04-07 1:54 ` Dexuan Cui
1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2016-04-06 20:59 UTC (permalink / raw)
To: decui; +Cc: netdev
From: Dexuan Cui <decui@microsoft.com>
Date: Tue, 5 Apr 2016 07:41:11 -0700
> This is for the recent kcm driver, which introduces AF_KCM(41) in
> b7ac4eb(kcm: Kernel Connection Multiplexor module).
>
> Signed-off-by: Dexuan Cui <decui@microsoft.com>
> Cc: Signed-off-by: Tom Herbert <tom@herbertland.com>
As this is a bug fix actually, applied to 'net'.
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net-next] net: add the AF_KCM entries to family name tables
2016-04-06 20:59 ` David Miller
@ 2016-04-07 1:54 ` Dexuan Cui
2016-04-07 3:59 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Dexuan Cui @ 2016-04-07 1:54 UTC (permalink / raw)
To: David Miller; +Cc: netdev@vger.kernel.org
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Thursday, April 7, 2016 5:00
> To: Dexuan Cui <decui@microsoft.com>
> Cc: netdev@vger.kernel.org
> Subject: Re: [PATCH net-next] net: add the AF_KCM entries to family name
> tables
>
> From: Dexuan Cui <decui@microsoft.com>
> Date: Tue, 5 Apr 2016 07:41:11 -0700
>
> > This is for the recent kcm driver, which introduces AF_KCM(41) in
> > b7ac4eb(kcm: Kernel Connection Multiplexor module).
> >
> > Signed-off-by: Dexuan Cui <decui@microsoft.com>
> > Cc: Signed-off-by: Tom Herbert <tom@herbertland.com>
>
> As this is a bug fix actually, applied to 'net'.
David,
Can you please apply this to net-next too?
It looks net-next is open now and I'm going to resubmit my
AF_HYPERV patchset, which needs to add AF_HYPERV entries to the
family name tables too.
Thanks,
-- Dexuan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: add the AF_KCM entries to family name tables
2016-04-07 1:54 ` Dexuan Cui
@ 2016-04-07 3:59 ` David Miller
2016-04-07 4:52 ` Dexuan Cui
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2016-04-07 3:59 UTC (permalink / raw)
To: decui; +Cc: netdev
From: Dexuan Cui <decui@microsoft.com>
Date: Thu, 7 Apr 2016 01:54:18 +0000
> Can you please apply this to net-next too?
That will happen transparently the next time I merge 'net' into
'net-next'.
It will happen at a time of my own choosing, and usually occurs
when I do a push of my 'net' tree to Linus and he takes it in,
and I know people need some 'net' things in 'net-next'.
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net-next] net: add the AF_KCM entries to family name tables
2016-04-07 3:59 ` David Miller
@ 2016-04-07 4:52 ` Dexuan Cui
0 siblings, 0 replies; 6+ messages in thread
From: Dexuan Cui @ 2016-04-07 4:52 UTC (permalink / raw)
To: David Miller; +Cc: netdev@vger.kernel.org
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Thursday, April 7, 2016 11:59
> To: Dexuan Cui <decui@microsoft.com>
> Cc: netdev@vger.kernel.org
> Subject: Re: [PATCH net-next] net: add the AF_KCM entries to family name
> tables
>
> From: Dexuan Cui <decui@microsoft.com>
> Date: Thu, 7 Apr 2016 01:54:18 +0000
>
> > Can you please apply this to net-next too?
>
> That will happen transparently the next time I merge 'net' into
> 'net-next'.
>
> It will happen at a time of my own choosing, and usually occurs
> when I do a push of my 'net' tree to Linus and he takes it in,
> and I know people need some 'net' things in 'net-next'.
Thanks for the explanation!
So, at present, let me only post the single AF_HYPERV patch to
net-next and hold the patch that adds AF_HYPERV entries to the family
name tables.
Thanks,
-- Dexuan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-04-07 4:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-05 14:41 [PATCH net-next] net: add the AF_KCM entries to family name tables Dexuan Cui
2016-04-06 10:46 ` Dexuan Cui
2016-04-06 20:59 ` David Miller
2016-04-07 1:54 ` Dexuan Cui
2016-04-07 3:59 ` David Miller
2016-04-07 4:52 ` Dexuan Cui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).