git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-cpufreq'
[sfrench/cifs-2.6.git]
/
include
/
linux
/
if_macvlan.h
diff --git
a/include/linux/if_macvlan.h
b/include/linux/if_macvlan.h
index ddd33fd5904dbb32d428c449543ecc6e3dc8a010..c2702856295ebaaa06db6dddb7106a53d2e71315 100644
(file)
--- a/
include/linux/if_macvlan.h
+++ b/
include/linux/if_macvlan.h
@@
-61,6
+61,7
@@
struct macvlan_dev {
struct hlist_node hlist;
struct macvlan_port *port;
struct net_device *lowerdev;
+ void *fwd_priv;
struct macvlan_pcpu_stats __percpu *pcpu_stats;
DECLARE_BITMAP(mc_filter, MACVLAN_MC_FILTER_SZ);