diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2010-06-01 21:52:08 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-02 07:11:15 -0700 |
| commit | ab95bfe01f9872459c8678572ccadbf646badad0 (patch) | |
| tree | 8e11f94077c9a80f7af52ce3dd50591a686561d7 /net/bridge/br.c | |
| parent | ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option (diff) | |
| download | linux-dev-ab95bfe01f9872459c8678572ccadbf646badad0.tar.xz linux-dev-ab95bfe01f9872459c8678572ccadbf646badad0.zip | |
net: replace hooks in __netif_receive_skb V5
What this patch does is it removes two receive frame hooks (for bridge and for
macvlan) from __netif_receive_skb. These are replaced them with a single
hook for both. It only supports one hook per device because it makes no
sense to do bridging and macvlan on the same device.
Then a network driver (of virtual netdev like macvlan or bridge) can register
an rx_handler for needed net device.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br.c')
| -rw-r--r-- | net/bridge/br.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index 76357b547752..c8436fa31344 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -63,7 +63,6 @@ static int __init br_init(void) goto err_out4; brioctl_set(br_ioctl_deviceless_stub); - br_handle_frame_hook = br_handle_frame; #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) br_fdb_test_addr_hook = br_fdb_test_addr; @@ -100,7 +99,6 @@ static void __exit br_deinit(void) br_fdb_test_addr_hook = NULL; #endif - br_handle_frame_hook = NULL; br_fdb_fini(); } |