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_macvlan.h | |
parent | 20c59de2e6b6bc74bbf714dcd4e720afe8d516cf (diff) | |
download | linux-stable-ab95bfe01f9872459c8678572ccadbf646badad0.tar.gz linux-stable-ab95bfe01f9872459c8678572ccadbf646badad0.tar.bz2 linux-stable-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_macvlan.h')
-rw-r--r-- | include/linux/if_macvlan.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 9ea047aca795..c26a0e4f0ce8 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -84,8 +84,4 @@ extern int macvlan_link_register(struct rtnl_link_ops *ops); extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb, struct net_device *dev); - -extern struct sk_buff *(*macvlan_handle_frame_hook)(struct macvlan_port *, - struct sk_buff *); - #endif /* _LINUX_IF_MACVLAN_H */ |