From patchwork Mon Jun 25 13:33:13 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: 167112 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 B194FB6FD5 for ; Mon, 25 Jun 2012 23:36:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756865Ab2FYNgn (ORCPT ); Mon, 25 Jun 2012 09:36:43 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:35222 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756811Ab2FYNgl (ORCPT ); Mon, 25 Jun 2012 09:36:41 -0400 Received: by wgbdr13 with SMTP id dr13so4119967wgb.1 for ; Mon, 25 Jun 2012 06:36: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=n6BddXLyBQaVWKQn75kXSSoq+x1nEz7ONWyeReXqQYA=; b=LupNmDz8+KYsgt5HxuU4XvEhpRk5DA2TDjujrd8IzZHWoED5v6MucjzA5GLrxtpdtt 7AYsQ1awOBk2MQ3o3JU+cXY+Cgb+YoF2nq4gaGo1FuJTTgKVDEGaXsqq7cGLJu8pwxds ofmLP6XVKVb0Se45w3BsUVA5/kFWIdxMvNtz2NrwwrsPALVwK5P7H4xnEu9BH78LDmXb ppxNMFS5raR5xwmjvbyhzMDumtx5hmdTY8PmPJCR825YNJ7V2EPiX+yjmg985knsPHvY ULHlJa+pLyDMDg/Z20nRuvyiCNnuNF/yXAA9mJ+di6Ds/lACERm2V4r9e1NWxg85olwa xMSg== Received: by 10.216.201.215 with SMTP id b65mr6382389weo.168.1340631400565; Mon, 25 Jun 2012 06:36:40 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id fu8sm16877828wib.5.2012.06.25.06.36.39 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jun 2012 06:36:40 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net Cc: netdev@vger.kernel.org, dbaryshkov@gmail.com, Alexander Smirnov Subject: [PATCH 3/7] mac802154: short address setter Date: Mon, 25 Jun 2012 17:33:13 +0400 Message-Id: <1340631197-27691-4-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1340631197-27691-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1340631197-27691-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 A method to assign the IEEE802.15.4 short address was added to the MIB implementation. Signed-off-by: Alexander Smirnov --- net/mac802154/mac802154.h | 1 + net/mac802154/mib.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h index 5cb7dc2..9951072 100644 --- a/net/mac802154/mac802154.h +++ b/net/mac802154/mac802154.h @@ -108,6 +108,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, u8 page, u8 chan); /* MIB callbacks */ +void mac802154_dev_set_short_addr(struct net_device *dev, u16 val); 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/mib.c b/net/mac802154/mib.c index 8e772ed..d74503b 100644 --- a/net/mac802154/mib.c +++ b/net/mac802154/mib.c @@ -78,6 +78,23 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed) return; } +void mac802154_dev_set_short_addr(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->short_addr = val; + spin_unlock_bh(&priv->mib_lock); + + if ((priv->hw->ops->set_hw_addr_filt) && + (priv->hw->hw.hw_filt.short_addr != priv->short_addr)) { + priv->hw->hw.hw_filt.short_addr = priv->short_addr; + set_hw_addr_filt(dev, IEEE802515_AFILT_SADDR_CHANGED); + } +} + void mac802154_dev_set_ieee_addr(struct net_device *dev) { struct mac802154_sub_if_data *priv = netdev_priv(dev);