public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed
From: frank.blaschka@de.ibm.com
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
	Ursula Braun <ursula.braun@de.ibm.com>
Subject: [patch 3/5] [PATCH] netiucv: reinsert dev_alloc_name for device naming
Date: Tue, 15 Nov 2011 13:31:14 +0100	[thread overview]
Message-ID: <20111115123152.472050433@de.ibm.com> (raw)
In-Reply-To: 20111115123111.128739986@de.ibm.com

[-- Attachment #1: 621-netiucv-dev-alloc-name.diff --]
[-- Type: text/plain, Size: 957 bytes --]

From: Ursula Braun <ursula.braun@de.ibm.com>

Invocation of dev_alloc_name() is re-inserted, because the created
net_device name is used to create the device name for the iucv bus.
This device is created before the register_netdev call.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---

 drivers/s390/net/netiucv.c |    2 ++
 1 file changed, 2 insertions(+)

diff -urpN linux-2.6/drivers/s390/net/netiucv.c linux-2.6-patched/drivers/s390/net/netiucv.c
--- linux-2.6/drivers/s390/net/netiucv.c	2011-10-24 09:10:05.000000000 +0200
+++ linux-2.6-patched/drivers/s390/net/netiucv.c	2011-11-14 18:27:17.000000000 +0100
@@ -1994,6 +1994,8 @@ static struct net_device *netiucv_init_n
 			   netiucv_setup_netdevice);
 	if (!dev)
 		return NULL;
+	if (dev_alloc_name(dev, dev->name) < 0)
+		goto out_netdev;
 
 	privptr = netdev_priv(dev);
 	privptr->fsm = init_fsm("netiucvdev", dev_state_names,

  parent reply	other threads:[~2011-11-15 12:31 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-15 12:31 [patch 0/5] s390: network driver bug fixes for 3.2.0 next rc frank.blaschka
2011-11-15 12:31 ` [patch 1/5] [PATCH] qeth: return with -EPERM if sniffing is not enabled frank.blaschka
2011-11-15 12:31 ` [patch 2/5] [PATCH] qeth: remove WARN_ON leftover frank.blaschka
2011-11-15 12:31 ` frank.blaschka [this message]
2011-11-15 12:31 ` [patch 4/5] [PATCH] qeth: l3 fix rcu splat in xmit frank.blaschka
2011-11-15 12:31 ` [patch 5/5] [PATCH] qeth: Reduce CPU consumption through less SIGA-r calls frank.blaschka
2011-11-16 22:47 ` [patch 0/5] s390: network driver bug fixes for 3.2.0 next rc David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111115123152.472050433@de.ibm.com \
    --to=frank.blaschka@de.ibm.com \
    --cc=davem@davemloft.net \
    --cc=linux-s390@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=ursula.braun@de.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox