From 553585a0008778fb2157c8fd6d0959d0fe908fc9 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 8 Mar 2020 01:07:26 +0800 Subject: [PATCH] net: phy_notify_subscribe call phy_notify_unsubscribe if sigev_notify equals SIGEV_NONE --- drivers/net/phy_notify.c | 49 +++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c index 7d6abb8cad..ec3bc210db 100644 --- a/drivers/net/phy_notify.c +++ b/drivers/net/phy_notify.c @@ -1,35 +1,20 @@ /**************************************************************************** * drivers/net/phy_notify.c * - * Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ****************************************************************************/ @@ -132,7 +117,8 @@ static sem_t g_notify_clients_sem = SEM_INITIALIZER(1); /* This is a array the hold information for each PHY notification client */ -static struct phy_notify_s g_notify_clients[CONFIG_PHY_NOTIFICATION_NCLIENTS]; +static struct phy_notify_s + g_notify_clients[CONFIG_PHY_NOTIFICATION_NCLIENTS]; /**************************************************************************** * Private Functions @@ -290,6 +276,13 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, phyinfo("Actual PID=%d\n", pid); } + /* Unsubscribe if sigev_notify field equals SIGEV_NONE */ + + if (event->sigev_notify == SIGEV_NONE) + { + return phy_notify_unsubscribe(intf, pid); + } + /* Check if this client already exists */ client = phy_find_assigned(intf, pid);