From patchwork Wed Jul 16 22:43:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 370895 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 AFCE9140093 for ; Thu, 17 Jul 2014 08:44:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754600AbaGPWoR (ORCPT ); Wed, 16 Jul 2014 18:44:17 -0400 Received: from mail-la0-f48.google.com ([209.85.215.48]:46909 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754573AbaGPWoQ (ORCPT ); Wed, 16 Jul 2014 18:44:16 -0400 Received: by mail-la0-f48.google.com with SMTP id gl10so1121268lab.7 for ; Wed, 16 Jul 2014 15:44:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PbRjKAE/O6fl4BxbMKU/5K/azPbGV20eiiZCYtFn0i8=; b=jFZVk9SKFbD4e2JDk0swDYzbxU9cTKkA0qhZoyKhVHoXKXWlCujnAEJeDjgoCJvnRC sdk6RRLY3hDU+A3fqAGrj4O3+OncdpmqucsjH5FupXr3YAazOkJTUbKeenxbBcybgWZX opQ/Urq1s89lAmqLoZ/fsIS1v2aMPI2Qt0jC/6JcoaxTM6mmD4kyRyU3Qfm4IGcDeq6v KJx/cxbfT7ObdJTOnkLgV9FHV8Wv1CcUXE+uDeJsJoNnAsvWzdFrpO+iwn0sEuxjN54n 8x6AA7KgLVUlP8UcNXAesf5lRZ/SySR8hEy7G91NVOYh6l8ni31rv6Ey+iNz2XpOBCrS C6aQ== X-Gm-Message-State: ALoCoQnwIcRZiJbTqzsAhvT/bYEE4FPYimtRuKFuglQnH+ByxOzOhrqrDUcb0tUE8kD16F2wdPKK X-Received: by 10.152.27.66 with SMTP id r2mr17089643lag.53.1405550654633; Wed, 16 Jul 2014 15:44:14 -0700 (PDT) Received: from tomegun-x240.localdomain (cm-84.208.72.173.getinternet.no. [84.208.72.173]) by mx.google.com with ESMTPSA id jf10sm14720lac.26.2014.07.16.15.43.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 15:44:13 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen , Karsten Keil Subject: [PATCH v8] net: isdn - set name assign type Date: Thu, 17 Jul 2014 00:43:09 +0200 Message-Id: <1405550594-11786-2-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405550594-11786-1-git-send-email-teg@jklm.no> References: <1405550594-11786-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Tom Gundersen Cc: Karsten Keil --- This patch goes on top of net-next. drivers/isdn/i4l/isdn_common.c | 4 ++-- drivers/isdn/i4l/isdn_net.c | 10 +++++----- drivers/isdn/i4l/isdn_net.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 9b856e1..67840ca 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c @@ -1364,7 +1364,7 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) } ret = mutex_lock_interruptible(&dev->mtx); if (ret) return ret; - if ((s = isdn_net_new(s, NULL))) { + if ((s = isdn_net_new(s, NET_NAME_USER, NULL))) { if (copy_to_user(argp, s, strlen(s) + 1)) { ret = -EFAULT; } else { @@ -1383,7 +1383,7 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) return -EINVAL; ret = mutex_lock_interruptible(&dev->mtx); if (ret) return ret; - if ((s = isdn_net_newslave(bname))) { + if ((s = isdn_net_newslave(bname, NET_NAME_USER))) { if (copy_to_user(argp, s, strlen(s) + 1)) { ret = -EFAULT; } else { diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index c2ed624..d16fec0 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c @@ -2573,7 +2573,7 @@ static void _isdn_setup(struct net_device *dev) * Allocate a new network-interface and initialize its data structures. */ char * -isdn_net_new(char *name, struct net_device *master) +isdn_net_new(char *name, unsigned char name_assign_type, struct net_device *master) { isdn_net_dev *netdev; @@ -2588,8 +2588,8 @@ isdn_net_new(char *name, struct net_device *master) printk(KERN_WARNING "isdn_net: Could not allocate net-device\n"); return NULL; } - netdev->dev = alloc_netdev(sizeof(isdn_net_local), name, - NET_NAME_UNKNOWN, _isdn_setup); + netdev->dev = alloc_netdev(sizeof(isdn_net_local), name, name_assign_type, + _isdn_setup); if (!netdev->dev) { printk(KERN_WARNING "isdn_net: Could not allocate network device\n"); kfree(netdev); @@ -2637,7 +2637,7 @@ isdn_net_new(char *name, struct net_device *master) } char * -isdn_net_newslave(char *parm) +isdn_net_newslave(char *parm, unsigned char name_assign_type) { char *p = strchr(parm, ','); isdn_net_dev *n; @@ -2658,7 +2658,7 @@ isdn_net_newslave(char *parm) /* Master must not be started yet */ if (isdn_net_device_started(n)) return NULL; - return (isdn_net_new(newname, n->dev)); + return (isdn_net_new(newname, name_assign_type, n->dev)); } return NULL; } diff --git a/drivers/isdn/i4l/isdn_net.h b/drivers/isdn/i4l/isdn_net.h index cca6d68..99f0c47 100644 --- a/drivers/isdn/i4l/isdn_net.h +++ b/drivers/isdn/i4l/isdn_net.h @@ -31,8 +31,8 @@ #define CISCO_SLARP_REPLY 1 #define CISCO_SLARP_KEEPALIVE 2 -extern char *isdn_net_new(char *, struct net_device *); -extern char *isdn_net_newslave(char *); +extern char *isdn_net_new(char *, unsigned char, struct net_device *); +extern char *isdn_net_newslave(char *, unsigned char); extern int isdn_net_rm(char *); extern int isdn_net_rmall(void); extern int isdn_net_stat_callback(int, isdn_ctrl *);