]> bbs.cooldavid.org Git - net-next-2.6.git/commit - net/core/dev.c
net: replace hooks in __netif_receive_skb V5
authorJiri Pirko <jpirko@redhat.com>
Tue, 1 Jun 2010 21:52:08 +0000 (21:52 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2010 14:11:15 +0000 (07:11 -0700)
commitab95bfe01f9872459c8678572ccadbf646badad0
tree8e11f94077c9a80f7af52ce3dd50591a686561d7
parent20c59de2e6b6bc74bbf714dcd4e720afe8d516cf
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>
drivers/net/macvlan.c
include/linux/if_bridge.h
include/linux/if_macvlan.h
include/linux/netdevice.h
net/bridge/br.c
net/bridge/br_if.c
net/bridge/br_input.c
net/bridge/br_private.h
net/core/dev.c