From patchwork Tue Nov 5 19:16:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 3143411 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 90BF3BEEB2 for ; Tue, 5 Nov 2013 19:23:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 610B0205BB for ; Tue, 5 Nov 2013 19:23:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E7A52058D for ; Tue, 5 Nov 2013 19:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755401Ab3KETW5 (ORCPT ); Tue, 5 Nov 2013 14:22:57 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:44574 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755391Ab3KETW4 (ORCPT ); Tue, 5 Nov 2013 14:22:56 -0500 Received: by mail-pa0-f51.google.com with SMTP id ld10so9278501pab.24 for ; Tue, 05 Nov 2013 11:22:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+g+hxmvmJaIp7CpA3B6k2EvTqC5V0uNQH/E7XH/LIgY=; b=YPUFORSYg3pSpapSmUVZq31g7lM9N0wP4o0Tc9DJnbLpPwNyo4X70WwVxQsQnL53TH aoDidx0lOBh1q/9ngA2/AaH1r9P3DvoqN314yZ4S06aXzaijMex93KQikrwCn+jp4/82 93AlR9xg8zvE4LzznIIQszVZzaa5a62A+1jUInjPvK5+mqAVnq0zQ0T8/ce1f58WHvrQ I1DA/FV7tPWvIF6WferUsRN5Oy5MDvtimzJlextOR7lJc0X6IzggVU6c7ylDNFjqxvbD VLAPcJo3efJImzpfoyZMSwsSUD1XPLppr/pQjGYBLeJvqpJDIN3ZtkmwE2xInR2Lv3e+ UtRA== X-Gm-Message-State: ALoCoQnfGYFmihmid+ODrppJ91Ox7eVzrBT3+p1k9rbrHEzHeQ/TZyNmzeVf17dfTXnQ2t0rOdoJ X-Received: by 10.68.171.5 with SMTP id aq5mr24707490pbc.21.1383679375748; Tue, 05 Nov 2013 11:22:55 -0800 (PST) Received: from cable.cozybit (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPSA id de1sm36237294pbc.7.2013.11.05.11.22.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2013 11:22:54 -0800 (PST) From: Thomas Pedersen To: Johannes Berg Cc: Bob Copeland , linux-wireless , open80211s Subject: [PATCH 09/17] mac80211: return -ENOMEM in mesh_plink_frame_tx Date: Tue, 5 Nov 2013 11:16:57 -0800 Message-Id: <1383679025-7150-9-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1383679025-7150-1-git-send-email-thomas@cozybit.com> References: <1383679025-7150-1-git-send-email-thomas@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bob Copeland All other paths return an error code, do the same here. Signed-off-by: Bob Copeland --- net/mac80211/mesh_plink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 550ebc1..429f692 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -283,7 +283,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 2 + 8 + /* peering IE */ sdata->u.mesh.ie_len); if (!skb) - return -1; + return err; info = IEEE80211_SKB_CB(skb); skb_reserve(skb, local->tx_headroom); mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);