Merge branch 'linus' into sched/core

[mv-sheeva.git] / include / linux / if_macvlan.h

diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 51f1512045e92584195233aab808e14f9ad4060f..b78a712247da071d03b207515936b9b28408fcf8 100644 (file)
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -7,6 +7,19 @@
 #include <linux/netlink.h>
 #include <net/netlink.h>
 
+#if defined(CONFIG_MACVTAP) || defined(CONFIG_MACVTAP_MODULE)
+struct socket *macvtap_get_socket(struct file *);
+#else
+#include <linux/err.h>
+#include <linux/errno.h>
+struct file;
+struct socket;
+static inline struct socket *macvtap_get_socket(struct file *f)
+{
+       return ERR_PTR(-EINVAL);
+}
+#endif /* CONFIG_MACVTAP */
+
 struct macvlan_port;
 struct macvtap_queue;
 
@@ -30,7 +43,7 @@ struct macvlan_dev {
        struct hlist_node       hlist;
        struct macvlan_port     *port;
        struct net_device       *lowerdev;
-       struct macvlan_rx_stats *rx_stats;
+       struct macvlan_rx_stats __percpu *rx_stats;
        enum macvlan_mode       mode;
        int (*receive)(struct sk_buff *skb);
        int (*forward)(struct net_device *dev, struct sk_buff *skb);