linux.git/net/bridge, branch v3.0-rc5

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

IGMP snooping: set mrouters_only flag for IPv6 traffic properly

2011-06-17T03:14:13+00:00

Upon reception of a MGM report packet the kernel sets the mrouters_only flag
in a skb that is a clone of the original skb, which means that the bridge
loses track of MGM packets (cb buffers are tied to a specific skb and not
shared) and it ends up forwading join requests to the bridge interface.

This can cause unexpected membership timeouts and intermitent/permanent loss
of connectivity as described in RFC 4541 [2.1.1. IGMP Forwarding Rules]:

    A snooping switch should forward IGMP Membership Reports only to
    those ports where multicast routers are attached.
    [...]
    Sending membership reports to other hosts can result, for IGMPv1
    and IGMPv2, in unintentionally preventing a host from joining a
    specific multicast group.

Signed-off-by: Fernando Luis Vazquez Cao 
Signed-off-by: David S. Miller

IGMP snooping: set mrouters_only flag for IPv4 traffic properly

2011-06-17T03:14:12+00:00

Upon reception of a IGMP/IGMPv2 membership report the kernel sets the
mrouters_only flag in a skb that may be a clone of the original skb, which
means that sometimes the bridge loses track of membership report packets (cb
buffers are tied to a specific skb and not shared) and it ends up forwading
join requests to the bridge interface.

This can cause unexpected membership timeouts and intermitent/permanent loss
of connectivity as described in RFC 4541 [2.1.1. IGMP Forwarding Rules]:

    A snooping switch should forward IGMP Membership Reports only to
    those ports where multicast routers are attached.
    [...]
    Sending membership reports to other hosts can result, for IGMPv1
    and IGMPv2, in unintentionally preventing a host from joining a
    specific multicast group.

Signed-off-by: Fernando Luis Vazquez Cao 
Tested-by: Hayato Kakuta 
Signed-off-by: David S. Miller

bridge: provide a cow_metrics method for fake_ops

2011-06-07T07:51:35+00:00

Like in commit 0972ddb237 (provide cow_metrics() methods to blackhole
dst_ops), we must provide a cow_metrics for bridges fake_dst_ops as
well.

This fixes a regression coming from commits 62fa8a846d7d (net: Implement
read-only protection and COW'ing of metrics.) and 33eb9873a28 (bridge:
initialize fake_rtable metrics)

ip link set mybridge mtu 1234
-->
[  136.546243] Pid: 8415, comm: ip Tainted: P 
2.6.39.1-00006-g40545b7 #103 ASUSTeK Computer Inc.         V1Sn 
        /V1Sn
[  136.546256] EIP: 0060:[<00000000>] EFLAGS: 00010202 CPU: 0
[  136.546268] EIP is at 0x0
[  136.546273] EAX: f14a389c EBX: 000005d4 ECX: f80d32c0 EDX: f80d1da1
[  136.546279] ESI: f14a3000 EDI: f255bf10 EBP: f15c3b54 ESP: f15c3b48
[  136.546285]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
[  136.546293] Process ip (pid: 8415, ti=f15c2000 task=f4741f80 
task.ti=f15c2000)
[  136.546297] Stack:
[  136.546301]  f80c658f f14a3000 ffffffed f15c3b64 c12cb9c8 f80d1b80 
ffffffa1 f15c3bbc
[  136.546315]  c12da347 c12d9c7d 00000000 f7670b00 00000000 f80d1b80 
ffffffa6 f15c3be4
[  136.546329]  00000004 f14a3000 f255bf20 00000008 f15c3bbc c11d6cae 
00000000 00000000
[  136.546343] Call Trace:
[  136.546359]  [] ? br_change_mtu+0x5f/0x80 [bridge]
[  136.546372]  [] dev_set_mtu+0x38/0x80
[  136.546381]  [] do_setlink+0x1a7/0x860
[  136.546390]  [] ? rtnl_fill_ifinfo+0x9bd/0xc70
[  136.546400]  [] ? nla_parse+0x6e/0xb0
[  136.546409]  [] rtnl_newlink+0x361/0x510
[  136.546420]  [] ? vmalloc_sync_all+0x100/0x100
[  136.546429]  [] ? error_code+0x5a/0x60
[  136.546438]  [] ? rtnl_configure_link+0x80/0x80
[  136.546446]  [] rtnetlink_rcv_msg+0xfa/0x210
[  136.546454]  [] ? __rtnl_unlock+0x20/0x20
[  136.546463]  [] netlink_rcv_skb+0x8e/0xb0
[  136.546471]  [] rtnetlink_rcv+0x1c/0x30
[  136.546479]  [] netlink_unicast+0x23a/0x280
[  136.546487]  [] netlink_sendmsg+0x26b/0x2f0
[  136.546497]  [] sock_sendmsg+0xc8/0x100
[  136.546508]  [] ? __alloc_pages_nodemask+0xe1/0x750
[  136.546517]  [] ? _copy_from_user+0x42/0x60
[  136.546525]  [] ? verify_iovec+0x4c/0xc0
[  136.546534]  [] sys_sendmsg+0x1c5/0x200
[  136.546542]  [] ? __do_fault+0x310/0x410
[  136.546549]  [] ? do_wp_page+0x1d6/0x6b0
[  136.546557]  [] ? handle_pte_fault+0xe1/0x720
[  136.546565]  [] ? sys_getsockname+0x7f/0x90
[  136.546574]  [] ? handle_mm_fault+0xb1/0x180
[  136.546582]  [] ? vmalloc_sync_all+0x100/0x100
[  136.546589]  [] ? do_page_fault+0x173/0x3d0
[  136.546596]  [] ? sys_recvmsg+0x3b/0x60
[  136.546605]  [] sys_socketcall+0x293/0x2d0
[  136.546614]  [] sysenter_do_call+0x12/0x26
[  136.546619] Code:  Bad EIP value.
[  136.546627] EIP: [<00000000>] 0x0 SS:ESP 0068:f15c3b48
[  136.546645] CR2: 0000000000000000
[  136.546652] ---[ end trace 6909b560e78934fa ]---

Signed-off-by: Alexander Holler 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

2011-05-27T17:04:40+00:00

netfilter: Fix several warnings in compat_mtw_from_user().

2011-05-26T17:09:07+00:00

Kill set but not used 'entry_offset'.

Add a default case to the switch statement so the compiler
can see that we always initialize off and size_kern before
using them.

Signed-off-by: David S. Miller 
Signed-off-by: Pablo Neira Ayuso

bridge: initialize fake_rtable metrics

2011-05-24T17:32:18+00:00

bridge netfilter code uses a fake_rtable, and we must init its _metric
field or risk NULL dereference later.

Ref: https://bugzilla.kernel.org/show_bug.cgi?id=35672

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: remove synchronize_net() from netdev_set_master()

2011-05-23T01:01:20+00:00

In the old days, we used to access dev->master in __netif_receive_skb()
in a rcu_read_lock section.

So one synchronize_net() call was needed in netdev_set_master() to make
sure another cpu could not use old master while/after we release it.

We now use netdev_rx_handler infrastructure and added one
synchronize_net() call in bond_release()/bond_release_all()

Remove the obsolete synchronize_net() from netdev_set_master() and add
one in bridge del_nbp() after its netdev_rx_handler_unregister() call.

This makes enslave -d a bit faster.

Signed-off-by: Eric Dumazet 
CC: Jiri Pirko 
CC: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: call NETDEV_JOIN notifiers when add a slave

2011-05-23T01:01:19+00:00

In the previous patch I added NETDEV_JOIN, now
we can notify netconsole when adding a device to a bridge too.

Signed-off-by: WANG Cong 
Cc: Neil Horman 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-17T21:33:11+00:00

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c