OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89cee91
)
macvlan: switch to use IS_ENABLED()
author
Jason Wang
<jasowang@redhat.com>
Wed, 5 Jun 2013 23:54:35 +0000
(23:54 +0000)
committer
David S. Miller
<davem@davemloft.net>
Sat, 8 Jun 2013 06:49:08 +0000
(23:49 -0700)
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/if_macvlan.h
patch
|
blob
|
history
diff --git
a/include/linux/if_macvlan.h
b/include/linux/if_macvlan.h
index
84dde1d
..
e47ad46
100644
(file)
--- a/
include/linux/if_macvlan.h
+++ b/
include/linux/if_macvlan.h
@@
-8,7
+8,7
@@
#include <net/netlink.h>
#include <linux/u64_stats_sync.h>
-#if
defined(CONFIG_MACVTAP) || defined(CONFIG_MACVTAP_MODULE
)
+#if
IS_ENABLED(CONFIG_MACVTAP
)
struct socket *macvtap_get_socket(struct file *);
#else
#include <linux/err.h>