From patchwork Fri Nov 6 12:39:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 37855 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 2F800B6F2B for ; Fri, 6 Nov 2009 23:42:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759213AbZKFMlJ (ORCPT ); Fri, 6 Nov 2009 07:41:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758850AbZKFMlI (ORCPT ); Fri, 6 Nov 2009 07:41:08 -0500 Received: from ey-out-2122.google.com ([74.125.78.25]:64606 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759129AbZKFMlF (ORCPT ); Fri, 6 Nov 2009 07:41:05 -0500 Received: by ey-out-2122.google.com with SMTP id 25so248343eya.19 for ; Fri, 06 Nov 2009 04:41:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=eA9/8m/GYvPHngvm3BMCRbviNAyB13nlUKBsmiK6L1U=; b=gtD4CEzpi84hN9AKyGAJ4nYeYF0bBKwBTHi2aNTy3j0Beccm2DFAbTLpE3e3u188dU X4pjK6ld7E9DYYtvQuOVTRMaCUCKIDRtEr1z6w8QNAXTKTeg+WynWzl2ZWuv4g0h6k7r some86X5aZlDIZVNr3v4QiPpm5nPd4v8KbU+c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=CD7SvjSoj72vTsZ59xXN/F9pp1jrlp47DU8V7BBwyUHaYnftLPmEXgt3+JEUrMuGWN oWPcSCcjOtb1rzHdaGmWkFQXMEddN2HJZgU8Pv+Tl2Ua62bU/kOFg2kHBFvg6z0ScVQ1 UZJu43K6WgwbvUeckIj1WuOZwbKmOPRGRNdC8= Received: by 10.213.100.168 with SMTP id y40mr811053ebn.28.1257511270518; Fri, 06 Nov 2009 04:41:10 -0800 (PST) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id 28sm345811eyg.30.2009.11.06.04.41.08 (version=SSLv3 cipher=RC4-MD5); Fri, 06 Nov 2009 04:41:09 -0800 (PST) From: Dmitry Eremin-Solenikov To: "David S. Miller" Cc: netdev@vger.kernel.org, Sergey Lapin Subject: [PATCH 16/17] ieee802154: add PHY_NAME to LIST_IFACE command results Date: Fri, 6 Nov 2009 15:39:40 +0300 Message-Id: <1257511181-19403-17-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.6.5 In-Reply-To: <1257511181-19403-1-git-send-email-dbaryshkov@gmail.com> References: <1257511181-19403-1-git-send-email-dbaryshkov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Dmitry Eremin-Solenikov --- net/ieee802154/nl-mac.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c index e8816bf..135c167 100644 --- a/net/ieee802154/nl-mac.c +++ b/net/ieee802154/nl-mac.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "ieee802154.h" @@ -251,6 +252,7 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags, struct net_device *dev) { void *hdr; + struct wpan_phy *phy; pr_debug("%s\n", __func__); @@ -259,7 +261,11 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 pid, if (!hdr) goto out; + phy = ieee802154_mlme_ops(dev)->get_phy(dev); + BUG_ON(!phy); + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)); NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN, @@ -268,9 +274,11 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 pid, ieee802154_mlme_ops(dev)->get_short_addr(dev)); NLA_PUT_U16(msg, IEEE802154_ATTR_PAN_ID, ieee802154_mlme_ops(dev)->get_pan_id(dev)); + wpan_phy_put(phy); return genlmsg_end(msg, hdr); nla_put_failure: + wpan_phy_put(phy); genlmsg_cancel(msg, hdr); out: return -EMSGSIZE;