From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cong Wang Subject: [Patch net-next 1/5] fou: avoid calling udp_del_offload() twice Date: Mon, 6 Apr 2015 16:41:26 -0700 Message-ID: <1428363690-16288-2-git-send-email-xiyou.wangcong@gmail.com> References: <1428363690-16288-1-git-send-email-xiyou.wangcong@gmail.com> Cc: Tom Herbert , Cong Wang To: netdev@vger.kernel.org Return-path: Received: from mail-pd0-f179.google.com ([209.85.192.179]:33112 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995AbbDFXlm (ORCPT ); Mon, 6 Apr 2015 19:41:42 -0400 Received: by pdbnk13 with SMTP id nk13so59491285pdb.0 for ; Mon, 06 Apr 2015 16:41:41 -0700 (PDT) In-Reply-To: <1428363690-16288-1-git-send-email-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: This fixes the following harmless warning: ./ip/ip fou del port 7777 [ 122.907516] udp_del_offload: didn't find offload for port 7777 Cc: Tom Herbert Signed-off-by: Cong Wang --- net/ipv4/fou.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c index ff069f6..c8db627 100644 --- a/net/ipv4/fou.c +++ b/net/ipv4/fou.c @@ -410,7 +410,8 @@ static void fou_release(struct fou *fou) struct socket *sock = fou->sock; struct sock *sk = sock->sk; - udp_del_offload(&fou->udp_offloads); + if (sk->sk_family == AF_INET) + udp_del_offload(&fou->udp_offloads); list_del(&fou->list); @@ -528,7 +529,6 @@ static int fou_destroy(struct net *net, struct fou_cfg *cfg) spin_lock(&fou_lock); list_for_each_entry(fou, &fou_list, list) { if (fou->port == port) { - udp_del_offload(&fou->udp_offloads); fou_release(fou); err = 0; break; -- 1.8.3.1