From patchwork Tue Jun 26 09:24:49 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: 167350 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 00363B6FA4 for ; Tue, 26 Jun 2012 19:29:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754103Ab2FZJ3J (ORCPT ); Tue, 26 Jun 2012 05:29:09 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:43136 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752429Ab2FZJ3E (ORCPT ); Tue, 26 Jun 2012 05:29:04 -0400 Received: by wibhq12 with SMTP id hq12so3484468wib.1 for ; Tue, 26 Jun 2012 02:29:03 -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=bFUM6MeeQbeescjiRvnpR2A9GnmTLVUJScxGcwreZHA=; b=kZHRRGX/QnhTyd3zVPFvqbYh7KXM0v6Q7O6UveLNrtRNrBOzzKw+V0K8sjb59DR8yD LRJ+Wldcit62lY56TT2gTJNbHNb4nZfCDmwg/VK6ViP5nyMpPQpPIomFq0VWAefpnjV7 YBaw0CinsgnO09DSzLmTCqsnwYS/2U1h/hYshrpu0aVfhTEP/ECH6S4MnCq5DRYn7xhj ccW39aJGGFDsssS8giK94/DiXfG2Ix/IZb1VKEUyjRJeIZchjXlDLeE44SKdBZMh9+Mv hygo4tcwI+1uSH0ft/HB3O17LXmcbGkeOrUvrrbXQneOl9iKOI221VAH+di4nnasAxFj xGNg== Received: by 10.216.199.1 with SMTP id w1mr8570027wen.19.1340702943264; Tue, 26 Jun 2012 02:29:03 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id z8sm6132508wiy.1.2012.06.26.02.29.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 26 Jun 2012 02:29:02 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net Cc: netdev@vger.kernel.org, dbaryshkov@gmail.com, Alexander Smirnov Subject: [PATCH v2 net-next 2/7] mac802154: set and get PAN id Date: Tue, 26 Jun 2012 13:24:49 +0400 Message-Id: <1340702694-24706-3-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1340702694-24706-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1340702694-24706-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 Two methods intended to get and set the Private Area Network identifier were added to the MIB implementation. Signed-off-by: Alexander Smirnov --- net/mac802154/mac802154.h | 2 ++ net/mac802154/mib.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h index c0efcf1..5cb7dc2 100644 --- a/net/mac802154/mac802154.h +++ b/net/mac802154/mac802154.h @@ -109,5 +109,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, /* MIB callbacks */ 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); #endif /* MAC802154_H */ diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c index ab59821..8e772ed 100644 --- a/net/mac802154/mib.c +++ b/net/mac802154/mib.c @@ -91,3 +91,34 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev) set_hw_addr_filt(dev, IEEE802515_AFILT_IEEEADDR_CHANGED); } } + +u16 mac802154_dev_get_pan_id(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->pan_id; + spin_unlock_bh(&priv->mib_lock); + + return ret; +} + +void mac802154_dev_set_pan_id(struct net_device *dev, u16 val) +{ + struct mac802154_sub_if_data *priv = netdev_priv(dev); + + BUG_ON(dev->type != ARPHRD_IEEE802154); + + spin_lock_bh(&priv->mib_lock); + priv->pan_id = val; + spin_unlock_bh(&priv->mib_lock); + + if ((priv->hw->ops->set_hw_addr_filt) && + (priv->hw->hw.hw_filt.pan_id != priv->pan_id)) { + priv->hw->hw.hw_filt.pan_id = priv->pan_id; + set_hw_addr_filt(dev, IEEE802515_AFILT_PANID_CHANGED); + } +}