From patchwork Mon Jul 9 10:22:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alex.bluesman.smirnov@gmail.com X-Patchwork-Id: 169751 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 453822C0377 for ; Mon, 9 Jul 2012 20:27:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753071Ab2GIK1A (ORCPT ); Mon, 9 Jul 2012 06:27:00 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:33420 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753005Ab2GIK0k (ORCPT ); Mon, 9 Jul 2012 06:26:40 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so5787740bkw.19 for ; Mon, 09 Jul 2012 03:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=xiD5Z0OSBpzFKiBR2y7Vf49kKBcwpAse1fOcFd8AvGw=; b=bjxCkU+yF5yT2rzxk9bqpPFMh+zPPtRknDcZqrjD+5J0M9s5q9CPbF5295Mbe10bSJ /lyVaSbQHSTRvojNAIs0Mb1XvtJGbWnQYtmwagRSFTHlOAoYuLYknVtgq3xApFn/YZ/d 3BSrPMY/ODlY1xS4sKr1HZF/Tu9t6t7BuO376pMRTDm1eUMau78D7yVr6V9Y6tNoJHQW yEVhbEjODbrhIC3G86mw7jJxtLxOQriyII5aqGZe6tEDqTBdM+t8GHR2RS2pxpFh8OAK wgfjfWs9Wo0LHdO6/I6v+1yEt52TfwJo072eqEbqer5kMUtighzJZwyF7YNZFphYHFIi VAog== Received: by 10.205.119.208 with SMTP id fv16mr4855831bkc.100.1341829600021; Mon, 09 Jul 2012 03:26:40 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id g6sm2416025bkg.2.2012.07.09.03.26.37 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 03:26:39 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net, eric.dumazet@gmail.com Cc: netdev@vger.kernel.org, Alexander Smirnov Subject: [PATCH net-next 3/6] mac802154: add get short address method Date: Mon, 9 Jul 2012 14:22:28 +0400 Message-Id: <1341829351-18485-4-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1341829351-18485-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1341829351-18485-1-git-send-email-alex.bluesman.smirnov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add method to get the device short 802.15.4 address. This call needed by ieee802154 layer to satisfy 'iz list' request from the user space. Signed-off-by: Alexander Smirnov --- net/mac802154/mac802154.h | 1 + net/mac802154/mac_cmd.c | 2 ++ net/mac802154/mib.c | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h index 6967864..a4dcaf1 100644 --- a/net/mac802154/mac802154.h +++ b/net/mac802154/mac802154.h @@ -109,6 +109,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, /* MIB callbacks */ void mac802154_dev_set_short_addr(struct net_device *dev, u16 val); +u16 mac802154_dev_get_short_addr(const struct net_device *dev); void mac802154_dev_set_ieee_addr(struct net_device *dev); u16 mac802154_dev_get_pan_id(const struct net_device *dev); void mac802154_dev_set_pan_id(struct net_device *dev, u16 val); diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c index 7f5403e..5d9a47b 100644 --- a/net/mac802154/mac_cmd.c +++ b/net/mac802154/mac_cmd.c @@ -71,4 +71,6 @@ struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced = { struct ieee802154_mlme_ops mac802154_mlme_wpan = { .get_phy = mac802154_get_phy, .start_req = mac802154_mlme_start_req, + .get_pan_id = mac802154_dev_get_pan_id, + .get_short_addr = mac802154_dev_get_short_addr, }; diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c index 380829d..5c66b8f 100644 --- a/net/mac802154/mib.c +++ b/net/mac802154/mib.c @@ -100,6 +100,20 @@ void mac802154_dev_set_short_addr(struct net_device *dev, u16 val) } } +u16 mac802154_dev_get_short_addr(const struct net_device *dev) +{ + struct mac802154_sub_if_data *priv = netdev_priv(dev); + u16 ret; + + BUG_ON(dev->type != ARPHRD_IEEE802154); + + spin_lock_bh(&priv->mib_lock); + ret = priv->short_addr; + spin_unlock_bh(&priv->mib_lock); + + return ret; +} + void mac802154_dev_set_ieee_addr(struct net_device *dev) { struct mac802154_sub_if_data *priv = netdev_priv(dev);