diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/if_link.h | 3 | ||||
-rw-r--r-- | include/linux/if_macvlan.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 2f4fa93454c7..f715750d0b87 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h | |||
@@ -255,6 +255,7 @@ struct ifla_vlan_qos_mapping { | |||
255 | enum { | 255 | enum { |
256 | IFLA_MACVLAN_UNSPEC, | 256 | IFLA_MACVLAN_UNSPEC, |
257 | IFLA_MACVLAN_MODE, | 257 | IFLA_MACVLAN_MODE, |
258 | IFLA_MACVLAN_FLAGS, | ||
258 | __IFLA_MACVLAN_MAX, | 259 | __IFLA_MACVLAN_MAX, |
259 | }; | 260 | }; |
260 | 261 | ||
@@ -267,6 +268,8 @@ enum macvlan_mode { | |||
267 | MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */ | 268 | MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */ |
268 | }; | 269 | }; |
269 | 270 | ||
271 | #define MACVLAN_FLAG_NOPROMISC 1 | ||
272 | |||
270 | /* SR-IOV virtual function management section */ | 273 | /* SR-IOV virtual function management section */ |
271 | 274 | ||
272 | enum { | 275 | enum { |
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index d103dca5c563..f65e8d250f7e 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h | |||
@@ -60,6 +60,7 @@ struct macvlan_dev { | |||
60 | struct net_device *lowerdev; | 60 | struct net_device *lowerdev; |
61 | struct macvlan_pcpu_stats __percpu *pcpu_stats; | 61 | struct macvlan_pcpu_stats __percpu *pcpu_stats; |
62 | enum macvlan_mode mode; | 62 | enum macvlan_mode mode; |
63 | u16 flags; | ||
63 | int (*receive)(struct sk_buff *skb); | 64 | int (*receive)(struct sk_buff *skb); |
64 | int (*forward)(struct net_device *dev, struct sk_buff *skb); | 65 | int (*forward)(struct net_device *dev, struct sk_buff *skb); |
65 | struct macvtap_queue *taps[MAX_MACVTAP_QUEUES]; | 66 | struct macvtap_queue *taps[MAX_MACVTAP_QUEUES]; |