linux-stable.git/net/bridge/br_device.c, branch linux-3.2.y

Merge branch 'master' of github.com:davem330/net

2011-10-07T17:38:43+00:00

Conflicts:
	net/batman-adv/soft-interface.c

bridge: allow forwarding some link local frames

2011-10-06T19:27:56+00:00

This is based on an earlier patch by Nick Carter with comments
by David Lamparter but with some refinements. Thanks for their patience
this is a confusing area with overlap of standards, user requirements,
and compatibility with earlier releases.

It adds a new sysfs attribute
   /sys/class/net/brX/bridge/group_fwd_mask
that controls forwarding of frames with address of: 01-80-C2-00-00-0X
The default setting has no forwarding to retain compatibility.

One change from earlier releases is that forwarding of group
addresses is not dependent on STP being enabled or disabled. This
choice was made based on interpretation of tie 802.1 standards.
I expect complaints will arise because of this, but better to follow
the standard than continue acting incorrectly by default.

The filtering mask is writeable, but only values that don't forward
known control frames are allowed. It intentionally blocks attempts
to filter control protocols. For example: writing a 8 allows
forwarding 802.1X PAE addresses which is the most common request.

Reported-by: David Lamparter 
Original-patch-by: Nick Carter 
Signed-off-by: Stephen Hemminger 
Tested-by: Benjamin Poirier 
Signed-off-by: David S. Miller

bridge: leave carrier on for empty bridge

2011-10-06T19:26:50+00:00

This resolves a regression seen by some users of bridging.
Some users use the bridge like a dummy device.
They expect to be able to put an IPv6 address on the device
with no ports attached. Although there are better ways of doing
this, there is no reason to not allow it.

Note: the bridge still will reflect the state of ports in the
bridge if there are any added.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

net: remove use of ndo_set_multicast_list in drivers

2011-08-18T03:22:03+00:00

replace it by ndo_set_rx_mode

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bridge: Always flood broadcast packets

2011-07-06T01:39:39+00:00

As is_multicast_ether_addr returns true on broadcast packets as
well, we need to explicitly exclude broadcast packets so that
they're always flooded.  This wasn't an issue before as broadcast
packets were considered to be an unregistered multicast group,
which were always flooded.  However, as we now only flood such
packets to router ports, this is no longer acceptable.

Reported-by: Michael Guntsche 
Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

netpoll: copy dev name of slaves to struct netpoll

2011-06-19T23:13:01+00:00

Otherwise we will not see the name of the slave dev in error
message:

[  388.469446] (null):  doesn't support polling, aborting.

Signed-off-by: WANG Cong 
Signed-off-by: David S. Miller

bridge: convert br_features_recompute() to ndo_fix_features

2011-04-28T20:33:08+00:00

Note: netdev_update_features() needs only rtnl_lock as br->port_list
is only changed while holding it.

Signed-off-by: Michał Mirosław 
Signed-off-by: David S. Miller

bridge: allow creating bridge devices with netlink

2011-04-05T00:22:28+00:00

Add netlink device ops to allow creating bridge device via netlink.
This works in a manner similar to vlan, macvlan and bonding.

Example:
  # ip link add link dev br0 type bridge
  # ip link del dev br0

The change required rearranging initializtion code to deal with
being called by create link. Most of the initialization happens
in br_dev_setup, but allocation of stats is done in ndo_init callback
to deal with allocation failure. Sysfs setup has to wait until
after the network device kobject is registered.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: control carrier based on ports online

2011-03-14T21:29:02+00:00

This makes the bridge device behave like a physical device.
In earlier releases the bridge always asserted carrier. This
changes the behavior so that bridge device carrier is on only
if one or more ports are in the forwarding state. This
should help IPv6 autoconfiguration, DHCP, and routing daemons.

I did brief testing with Network and Virt manager and they
seem fine, but since this changes behavior of bridge, it should
wait until net-next (2.6.39).

Signed-off-by: Stephen Hemminger 
Reviewed-by: Nicolas de Pesloüan 
Tested-By: Adam Majer 
Signed-off-by: David S. Miller

bridge: implement [add/del]_slave ops

2011-02-14T00:58:40+00:00

add possibility to addif/delif via rtnetlink

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller