projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.16-rc1' into i2c/for-next
[linux-2.6-block.git]
/
include
/
linux
/
if_macvlan.h
diff --git
a/include/linux/if_macvlan.h
b/include/linux/if_macvlan.h
index a9a53b12397b0c4fd29a11cbf5f9cbbd18944fd8..6b2c7cf352a5582aff86da52f4feac7ae7d208e4 100644
(file)
--- a/
include/linux/if_macvlan.h
+++ b/
include/linux/if_macvlan.h
@@
-57,6
+57,9
@@
struct macvlan_dev {
netdev_features_t tap_features;
int minor;
int nest_level;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ struct netpoll *netpoll;
+#endif
};
static inline void macvlan_count_rx(const struct macvlan_dev *vlan,