diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
| commit | 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 (patch) | |
| tree | bedfff6f96118771b809de30e559cc370f94c7be /net/bridge/br_input.c | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
| parent | 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index b0b7f55c1edd..bfa4d8c333f7 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
| @@ -66,6 +66,7 @@ int br_handle_frame_finish(struct sk_buff *skb) | |||
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | if (is_multicast_ether_addr(dest)) { | 68 | if (is_multicast_ether_addr(dest)) { |
| 69 | br->statistics.multicast++; | ||
| 69 | br_flood_forward(br, skb, !passedup); | 70 | br_flood_forward(br, skb, !passedup); |
| 70 | if (!passedup) | 71 | if (!passedup) |
| 71 | br_pass_frame_up(br, skb); | 72 | br_pass_frame_up(br, skb); |