From patchwork Tue Jun 26 09:24:50 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: 167351 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 B65C0B7006 for ; Tue, 26 Jun 2012 19:29:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755159Ab2FZJ3J (ORCPT ); Tue, 26 Jun 2012 05:29:09 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:39535 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751676Ab2FZJ3G (ORCPT ); Tue, 26 Jun 2012 05:29:06 -0400 Received: by wibhr14 with SMTP id hr14so2023391wib.1 for ; Tue, 26 Jun 2012 02:29:04 -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=ohxWFK/VhoV4tTRbToUOkUIwphecXuCZAzf9VbySbWOQ0rBad0i2AEIFO+VZwWdPJr mHfy4XnKR0Wswzkg9fhNB0Du11cpRUvtIcD8eS5vBnTu7G+fYn9tvfP5MKR+13qHStzT elZhxsPU3d/7TgzMSJNFJSXYEIsuh0a/cefdGRZFytHqUUgQWZg86mdpz74q5/sgXKDU KfKu6WLLjvybZdFp2VKjkT6brjIB/RZH57KbeDlIGUfadS65VLePTairEoOeGnSO8PZW VP80HtRlDj+SLK1niL+gqOmbmmnPhb5j0YUc/exaYHxHTjMfv3Ge5m2F+MeS8JnYtcYz WgIQ== Received: by 10.180.87.35 with SMTP id u3mr27095254wiz.2.1340702944787; Tue, 26 Jun 2012 02:29:04 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id z8sm6132508wiy.1.2012.06.26.02.29.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 26 Jun 2012 02:29:04 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net Cc: netdev@vger.kernel.org, dbaryshkov@gmail.com, Alexander Smirnov Subject: [PATCH v2 net-next 3/7] mac802154: short address setter Date: Tue, 26 Jun 2012 13:24:50 +0400 Message-Id: <1340702694-24706-4-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 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);