All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@vyatta.com>
To: David Miller <davem@davemloft.net>
Cc: randy.dunlap@oracle.com, sfr@canb.auug.org.au,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org
Subject: [PATCH -next] bridge: fix build for CONFIG_SYSFS disabled
Date: Tue, 18 May 2010 10:28:37 -0700	[thread overview]
Message-ID: <20100518102837.2622c3b1@nehalam> (raw)
In-Reply-To: <20100517.223237.55871633.davem@davemloft.net>


From: Randy Dunlap <randy.dunlap@oracle.com>

Fix build when CONFIG_SYSFS is not enabled:
net/bridge/br_if.c:136: error: 'struct net_bridge_port' has no member named 'sysfs_name'

Note: dev->name == sysfs_name except when change name is in
progress, and we are protected from that by RTNL mutex.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-off-by: Stephen Hemminger <shemminger@vyatta.com>


--- a/net/bridge/br_if.c	2010-05-17 10:51:48.638634187 -0700
+++ b/net/bridge/br_if.c	2010-05-18 10:22:28.892111158 -0700
@@ -133,7 +133,7 @@ static void del_nbp(struct net_bridge_po
 	struct net_bridge *br = p->br;
 	struct net_device *dev = p->dev;
 
-	sysfs_remove_link(br->ifobj, p->sysfs_name);
+	sysfs_remove_link(br->ifobj, p->dev->name);
 
 	dev_set_promiscuity(dev, -1);
 

  reply	other threads:[~2010-05-18 17:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-17  6:35 linux-next: Tree for May 17 Stephen Rothwell
2010-05-17 16:16 ` [PATCH -next] pcmciamtd: fix printk format warnings Randy Dunlap
2010-05-17 16:16   ` Randy Dunlap
2010-05-17 18:55   ` David Woodhouse
2010-05-17 18:55     ` David Woodhouse
2010-05-17 16:17 ` [PATCH -next] bridge: fix build for CONFIG_SYSFS disabled Randy Dunlap
2010-05-17 17:56   ` Stephen Hemminger
2010-05-17 18:01     ` Randy Dunlap
2010-05-18  5:32       ` David Miller
2010-05-18 17:28         ` Stephen Hemminger [this message]
2010-05-18 19:26           ` 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=20100518102837.2622c3b1@nehalam \
    --to=shemminger@vyatta.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.