← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to net/bridge/br.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/bridge/br.c
22
22
 
23
23
#include "br_private.h"
24
24
 
25
 
int (*br_should_route_hook)(struct sk_buff *skb);
26
 
 
27
25
static const struct stp_proto br_stp_proto = {
28
26
        .rcv    = br_stp_rcv,
29
27
};
38
36
 
39
37
        err = stp_proto_register(&br_stp_proto);
40
38
        if (err < 0) {
41
 
                printk(KERN_ERR "bridge: can't register sap for STP\n");
 
39
                pr_err("bridge: can't register sap for STP\n");
42
40
                return err;
43
41
        }
44
42
 
63
61
                goto err_out4;
64
62
 
65
63
        brioctl_set(br_ioctl_deviceless_stub);
66
 
        br_handle_frame_hook = br_handle_frame;
67
64
 
68
65
#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
69
66
        br_fdb_test_addr_hook = br_fdb_test_addr;
100
97
        br_fdb_test_addr_hook = NULL;
101
98
#endif
102
99
 
103
 
        br_handle_frame_hook = NULL;
104
100
        br_fdb_fini();
105
101
}
106
102
 
107
 
EXPORT_SYMBOL(br_should_route_hook);
108
 
 
109
103
module_init(br_init)
110
104
module_exit(br_deinit)
111
105
MODULE_LICENSE("GPL");