From patchwork Thu Jul 17 08:06:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 371005 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 88E161400D6 for ; Thu, 17 Jul 2014 18:08:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755557AbaGQIHy (ORCPT ); Thu, 17 Jul 2014 04:07:54 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:40550 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755398AbaGQIGg (ORCPT ); Thu, 17 Jul 2014 04:06:36 -0400 Received: by mail-we0-f170.google.com with SMTP id w62so2051187wes.29 for ; Thu, 17 Jul 2014 01:06:34 -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=G54qvCwNyHZek2xP6sGJ7MNboDhMazpFKu2AGoEEP59p8+5FV1Z5iHNkj+IRsPCfAb mA2M7wTxCJmOBGZzpgMlrAw9W7BSO29gI8ili+9qJ3R4cXbGIkWuAT9JIV8h05dZHDPD M24bkQXvQtEHq/v0k9/kJVCvqnFDkZ2eUvWaYFcEZ7OOdrpGHtjXoiSlKKZhrbU+dQ40 KHKhIAuk28QJrnjM1Q+6nFHmtKKo2mf63Nl4+KHVdeTA442q2bDC3XjxpbbQiEMYcH3F PjUvz5LPUDGH8O2Q+jnJa5sPwpc+kb59wJb6s87Cg7Tna8oSUoqf6sOTD1YQnBUY88u6 d83w== X-Gm-Message-State: ALoCoQkWcjkO+eBjPb3gUCg3OPZQuG6+akBCObN8KorU7zrKDrC5NTctSUH/i05A4jI5+Rs3QWZy X-Received: by 10.180.189.234 with SMTP id gl10mr19893901wic.56.1405584391838; Thu, 17 Jul 2014 01:06:31 -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 ch5sm4297467wjb.18.2014.07.17.01.06.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 01:06:31 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen , Karsten Keil Subject: [PATCH net-next v9 6/9] net: isdn - set name assign type Date: Thu, 17 Jul 2014 10:06:07 +0200 Message-Id: <1405584370-30054-7-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405584370-30054-1-git-send-email-teg@jklm.no> References: <1405584370-30054-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 *);