From patchwork Thu Jul 10 08:17:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368516 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 023581400DD for ; Thu, 10 Jul 2014 18:24:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752235AbaGJISq (ORCPT ); Thu, 10 Jul 2014 04:18:46 -0400 Received: from mail-lb0-f179.google.com ([209.85.217.179]:38571 "EHLO mail-lb0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752217AbaGJISl (ORCPT ); Thu, 10 Jul 2014 04:18:41 -0400 Received: by mail-lb0-f179.google.com with SMTP id z11so5833411lbi.10 for ; Thu, 10 Jul 2014 01:18:40 -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=o2RBX1dCsGWFFTxqYkZ1aWjFrIkRRC96ATW2w54Ulaw=; b=l2HTCMPJ47W81BWnNqPt4h5J82EEcrUQRx/qAIxsTcp6AKnKoNdyh/+UAsncoRg3k4 2qmJaPyy1UzBFOvQhXFo4WRZgQRBISmB987Gcpp2Js9Wam4iDLc2phXlhUagAOuPkgeM iQYsayS9bk/0QBR4eB16HzG3I5RkCWZANwQ8Gpyu1UvDq0vdQo1OMTAFSZnsRDGA9TAz 1JoU/2zfepRIhgZuQMMbYTh4vaA/eCSIPHW8GDbA7RBHgC7B1UpfaCgMLrz/M6FFfDd+ 6N42bQjliQZHSxmwfzwdvlGtwLa8AleCLDcKc6rH0U1Wi75yHllQYQPbsr9oisks4Lcf 3EyA== X-Gm-Message-State: ALoCoQkjejsBKWjTO647AdFvHXaKJgddcqNtqe0MHNmkXpc9Yyq2ridpvw+698DWduNuAKS8606T X-Received: by 10.112.91.163 with SMTP id cf3mr2791816lbb.42.1404980319944; Thu, 10 Jul 2014 01:18:39 -0700 (PDT) Received: from localhost.localdomain (m188-149-105-114.cust.tele2.no. [188.149.105.114]) by mx.google.com with ESMTPSA id tg1sm37154793lbb.11.2014.07.10.01.18.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:38 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Karsten Keil Subject: [PATCH v7 19/33] net: isdn - set name assign type Date: Thu, 10 Jul 2014 10:17:24 +0200 Message-Id: <1404980258-30853-20-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404980258-30853-1-git-send-email-teg@jklm.no> References: <1404980258-30853-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 --- 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 *);