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 /include/linux/if_bridge.h | |
| 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 'include/linux/if_bridge.h')
| -rw-r--r-- | include/linux/if_bridge.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 938b7e81df95..0d241a5c4909 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -102,8 +102,6 @@ struct __fdb_entry { #include <linux/netdevice.h> extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); -extern struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p, - struct sk_buff *skb); extern int (*br_should_route_hook)(struct sk_buff *skb); #endif |