diff options
| author | Cong Wang | 2014-05-21 02:30:00 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-05-22 21:33:47 +0200 |
| commit | b1282726d53465c7362eb134eb335173e8cd5b8c (patch) | |
| tree | b8add1f37fa1d12ce7d3e6cc230b54560c23c978 /net/bridge/br_private.h | |
| parent | net/dccp/timer.c: use 'u64' instead of 's64' to avoid compiler's warning (diff) | |
| download | kernel-qcow2-linux-b1282726d53465c7362eb134eb335173e8cd5b8c.tar.gz kernel-qcow2-linux-b1282726d53465c7362eb134eb335173e8cd5b8c.tar.xz kernel-qcow2-linux-b1282726d53465c7362eb134eb335173e8cd5b8c.zip | |
bridge: make br_device_notifier static
Merge net/bridge/br_notify.c into net/bridge/br.c,
since it has only br_device_event() and br.c is small.
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index af067711574f..53d6e32965fc 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -333,8 +333,6 @@ struct br_input_skb_cb { #define br_debug(br, format, args...) \ pr_debug("%s: " format, (br)->dev->name, ##args) -extern struct notifier_block br_device_notifier; - /* called under bridge lock */ static inline int br_is_root_bridge(const struct net_bridge *br) { |