Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / if_macvlan.h

diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index b78a712247da071d03b207515936b9b28408fcf8..9ea047aca7955e7c654512b37648617d8c76c904 100644 (file)
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -85,6 +85,7 @@ extern netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
                                      struct net_device *dev);
 
 
-extern struct sk_buff *(*macvlan_handle_frame_hook)(struct sk_buff *);
+extern struct sk_buff *(*macvlan_handle_frame_hook)(struct macvlan_port *,
+                                                   struct sk_buff *);
 
 #endif /* _LINUX_IF_MACVLAN_H */