From patchwork Thu Aug 20 16:13:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 31744 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2E819B7079 for ; Fri, 21 Aug 2009 02:14:49 +1000 (EST) Received: by ozlabs.org (Postfix) id 22003DDD0C; Fri, 21 Aug 2009 02:14:49 +1000 (EST) 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 AD5EBDDD01 for ; Fri, 21 Aug 2009 02:14:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754867AbZHTQOU (ORCPT ); Thu, 20 Aug 2009 12:14:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754853AbZHTQOU (ORCPT ); Thu, 20 Aug 2009 12:14:20 -0400 Received: from mail-ew0-f207.google.com ([209.85.219.207]:63200 "EHLO mail-ew0-f207.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754809AbZHTQOR (ORCPT ); Thu, 20 Aug 2009 12:14:17 -0400 Received: by mail-ew0-f207.google.com with SMTP id 3so5527ewy.18 for ; Thu, 20 Aug 2009 09:14:18 -0700 (PDT) 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=vUSXIVMkcCMa1PYuEbJ29SA+01j47ffZ+d6VnuV5uZc=; b=GclZGsyAyyNLWFVT9hHeu0gUkg6V9i2bwAnAAREBUjxETVEEOcbo5imC1DDbEogEQP /q+CVFjAAfCbSqYgRb+XmK9p9SKvOhg/hqklZMUI+4vEdTOldPsCSEfyX79L3zXs9dRF vRMdI/6gzktPdFoecuUfLPh+NgNR1oMXk3C88= 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=ay3EnDpTgOKcKGU5eLJXAuWix8GSzLEXJEQXedWzZdjhxZzGj92Ize5tSsIiqo/GMJ Byfta/DyaI05ixisPc/ZmKfulirNl53j58kAugaUzjIeejLYUrII7W1MJxv9qbjNN36Z RWCssRSPA2KFAHLTZ83kLd44M3iui68QS98PU= Received: by 10.210.131.6 with SMTP id e6mr258241ebd.29.1250784858333; Thu, 20 Aug 2009 09:14:18 -0700 (PDT) Received: from localhost.localdomain (iap-pxy-mow1.siemens.ru [212.248.25.26]) by mx.google.com with ESMTPS id 7sm65984eyg.25.2009.08.20.09.14.16 (version=SSLv3 cipher=RC4-MD5); Thu, 20 Aug 2009 09:14:17 -0700 (PDT) From: Dmitry Eremin-Solenikov To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-zigbee-devel@lists.sourceforge.net, Sergey Lapin Subject: [PATCH 5/5] Drop ARPHRD_IEEE802154_PHY Date: Thu, 20 Aug 2009 20:13:07 +0400 Message-Id: <1250784787-30590-6-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1250784787-30590-5-git-send-email-dbaryshkov@gmail.com> References: <1250784787-30590-1-git-send-email-dbaryshkov@gmail.com> <1250784787-30590-2-git-send-email-dbaryshkov@gmail.com> <1250784787-30590-3-git-send-email-dbaryshkov@gmail.com> <1250784787-30590-4-git-send-email-dbaryshkov@gmail.com> <1250784787-30590-5-git-send-email-dbaryshkov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There are not maste devices in mac802154 anymore, so drop ARPHRD_IEEE802154_PHY definition. Signed-off-by: Dmitry Eremin-Solenikov --- include/linux/if_arp.h | 1 - net/core/dev.c | 4 ++-- net/ieee802154/af_ieee802154.c | 4 +--- net/ieee802154/raw.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index b554300..282eb37 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -87,7 +87,6 @@ #define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */ #define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */ #define ARPHRD_IEEE802154 804 -#define ARPHRD_IEEE802154_PHY 805 #define ARPHRD_PHONET 820 /* PhoNet media type */ #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */ diff --git a/net/core/dev.c b/net/core/dev.c index 09fb03f..4b83789 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -269,7 +269,7 @@ static const unsigned short netdev_lock_type[] = ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211, ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, - ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154, ARPHRD_IEEE802154_PHY, + ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE}; static const char *const netdev_lock_name[] = @@ -287,7 +287,7 @@ static const char *const netdev_lock_name[] = "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", - "_xmit_PHONET_PIPE", "_xmit_IEEE802154", "_xmit_IEEE802154_PHY", + "_xmit_PHONET_PIPE", "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"}; static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index d504c34..cd949d5 100644 --- a/net/ieee802154/af_ieee802154.c +++ b/net/ieee802154/af_ieee802154.c @@ -147,9 +147,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg, dev_load(sock_net(sk), ifr.ifr_name); dev = dev_get_by_name(sock_net(sk), ifr.ifr_name); - if ((dev->type == ARPHRD_IEEE802154 || - dev->type == ARPHRD_IEEE802154_PHY) && - dev->netdev_ops->ndo_do_ioctl) + if (dev->type == ARPHRD_IEEE802154 && dev->netdev_ops->ndo_do_ioctl) ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, cmd); if (!ret && copy_to_user(arg, &ifr, sizeof(struct ifreq))) diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index 60dee69..4681501 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c @@ -74,8 +74,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int len) goto out; } - if (dev->type != ARPHRD_IEEE802154_PHY && - dev->type != ARPHRD_IEEE802154) { + if (dev->type != ARPHRD_IEEE802154) { err = -ENODEV; goto out_put; }