diff --git a/[refs] b/[refs] index a41ddcae526d..93399d610221 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 434d7b380f2bfc2161b9aaee2cada177a4a4261f +refs/heads/master: 812e876e842488221aa54cb4587a8a33445cfa9e diff --git a/trunk/include/net/scm.h b/trunk/include/net/scm.h index 8360e47aa7e3..17d9d2e75ff1 100644 --- a/trunk/include/net/scm.h +++ b/trunk/include/net/scm.h @@ -19,8 +19,8 @@ struct scm_fp_list { }; struct scm_cookie { - struct ucred creds; /* Skb credentials */ struct scm_fp_list *fp; /* Passed files */ + struct ucred creds; /* Skb credentials */ #ifdef CONFIG_SECURITY_NETWORK u32 secid; /* Passed security ID */ #endif