diff options
| author |   H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 15:23:19 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 15:23:19 -0700 |
| commit | e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4 (patch) | |
| tree | 6a41361e1de2a6693ccae96b99307e79a467236f /net/tipc | |
| parent | x86, espfix: Make it possible to disable 16-bit support (diff) | |
| parent | Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option" (diff) | |
| download | wireguard-linux-e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4.tar.xz wireguard-linux-e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4.zip | |
Merge commit '7ed6fb9b5a5510e4ef78ab27419184741169978a' into x86/espfix
Merge in Linus' tree with:
fa81511bb0bb x86-64, modify_ldt: Make support for 16-bit segments a runtime option
... reverted, to avoid a conflict. This commit is no longer necessary
with the proper fix in place.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 3aaf73de9e2d..ad844d365340 100644 --- a/net/tipc/netlink.c +++ b/net/tipc/netlink.c @@ -47,7 +47,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info) int hdr_space = nlmsg_total_size(GENL_HDRLEN + TIPC_GENL_HDRLEN); u16 cmd; - if ((req_userhdr->cmd & 0xC000) && (!capable(CAP_NET_ADMIN))) + if ((req_userhdr->cmd & 0xC000) && (!netlink_capable(skb, CAP_NET_ADMIN))) cmd = TIPC_CMD_NOT_NET_ADMIN; else cmd = req_userhdr->cmd; |