lkml.org 
[lkml]   [2013]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 078/105] net/core/sock.c: add missing VSOCK string in af_family_*_key_strings
    Date
    3.8.13.4 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Federico Vaga <federico.vaga@gmail.com>

    [ Upstream commit 456db6a4d495f40777da6f1f32f62f13026f52db ]

    The three arrays of strings: af_family_key_strings,
    af_family_slock_key_strings and af_family_clock_key_strings have not
    VSOCK's string

    Signed-off-by: Federico Vaga <federico.vaga@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/core/sock.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/net/core/sock.c b/net/core/sock.c
    index b8af814..57b3243 100644
    --- a/net/core/sock.c
    +++ b/net/core/sock.c
    @@ -208,7 +208,7 @@ 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_MAX"
    + "sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "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" ,
    @@ -224,7 +224,7 @@ 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_MAX"
    + "slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_MAX"
    };
    static const char *const af_family_clock_key_strings[AF_MAX+1] = {
    "clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
    @@ -240,7 +240,7 @@ 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_MAX"
    + "clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_MAX"
    };

    /*
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-06-28 21:41    [W:4.210 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site