All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joerg Roedel <joro-lkml@zlug.org>
To: Patrick McHardy <kaber@trash.net>, davem@davemloft.net
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 02/03] net/bridge: add support for EtherIP devices
Date: Sat, 23 Sep 2006 14:16:29 +0200	[thread overview]
Message-ID: <20060923121629.GC32284@zlug.org> (raw)
In-Reply-To: <20060923120704.GA32284@zlug.org>

[-- Attachment #1: Type: text/plain, Size: 143 bytes --]

This patch changes the device check in the bridge code to allow EtherIP
devices to be added.

Signed-off-by: Joerg Roedel <joro-lkml@zlug.org>

[-- Attachment #2: patch_etherip_bridge --]
[-- Type: text/plain, Size: 614 bytes --]

diff -uprN -X linux-2.6.18-vanilla/Documentation/dontdiff linux-2.6.18-vanilla/net/bridge/br_if.c linux-2.6.18/net/bridge/br_if.c
--- linux-2.6.18-vanilla/net/bridge/br_if.c	2006-09-20 05:42:06.000000000 +0200
+++ linux-2.6.18/net/bridge/br_if.c	2006-09-20 23:03:26.000000000 +0200
@@ -407,7 +407,8 @@ int br_add_if(struct net_bridge *br, str
 	struct net_bridge_port *p;
 	int err = 0;
 
-	if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER)
+	if (dev->flags & IFF_LOOPBACK ||
+	    dev->type != ARPHRD_ETHER && dev->type != ARPHRD_ETHERIP)
 		return -EINVAL;
 
 	if (dev->hard_start_xmit == br_dev_xmit)

  parent reply	other threads:[~2006-09-23 12:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-23 12:07 [PATCH 00/03][RESUBMIT] net: EtherIP tunnel driver Joerg Roedel
2006-09-23 12:13 ` Jan-Benedict Glaw
2006-09-23 12:27   ` Joerg Roedel
2006-09-23 12:38   ` jamal
2006-09-23 13:27     ` Joerg Roedel
2006-09-25  1:07       ` Valdis.Kletnieks
2006-09-25  8:32         ` Joerg Roedel
2006-09-25 20:49           ` Brian Haley
2006-09-23 23:35     ` David Miller
2006-09-25  8:18       ` Joerg Roedel
2006-09-25 10:22       ` Andi Kleen
2006-09-25 11:57         ` Joerg Roedel
2006-09-25 12:16           ` Andi Kleen
2006-09-25 12:35             ` Joerg Roedel
2006-09-23 12:13 ` [PATCH 01/03] net: EtherIP driver, header and MAINTAINERS changes Joerg Roedel
2006-09-23 12:16 ` Joerg Roedel [this message]
2006-09-24  4:01   ` [PATCH 02/03] net/bridge: add support for EtherIP devices Stephen Hemminger
2006-09-25  8:24     ` Joerg Roedel
2006-09-25 14:40       ` Stephen Hemminger
2006-09-25 14:54         ` Joerg Roedel
2006-09-23 12:20 ` [PATCH 03/03][IPROUTE2] EtherIP tunnel and device support for iproute2 Joerg Roedel

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=20060923121629.GC32284@zlug.org \
    --to=joro-lkml@zlug.org \
    --cc=davem@davemloft.net \
    --cc=kaber@trash.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /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.