diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-06-14 23:27:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-15 14:47:12 -0400 |
commit | a35e2c1b6d90544b3c688783869817628e5f9607 (patch) | |
tree | 64fa6bc6b772248acfb92b5743c5f0d475126891 /include | |
parent | 93e2c32b5cb2ad92ceb1d7a4684f20a0d25bf530 (diff) |
macvlan: use rx_handler_data pointer to store macvlan_port pointer V2
Register macvlan_port pointer as rx_handler data pointer. As macvlan_port is
removed from struct net_device, another netdev priv_flag is added to indicate
the device serves as a macvlan port.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/if.h | 1 | ||||
-rw-r--r-- | include/linux/netdevice.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index be350e62a905..31f2e27ebcd0 100644 --- a/include/linux/if.h +++ b/include/linux/if.h | |||
@@ -73,6 +73,7 @@ | |||
73 | #define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ | 73 | #define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ |
74 | #define IFF_IN_NETPOLL 0x1000 /* whether we are processing netpoll */ | 74 | #define IFF_IN_NETPOLL 0x1000 /* whether we are processing netpoll */ |
75 | #define IFF_DISABLE_NETPOLL 0x2000 /* disable netpoll at run-time */ | 75 | #define IFF_DISABLE_NETPOLL 0x2000 /* disable netpoll at run-time */ |
76 | #define IFF_MACVLAN_PORT 0x4000 /* device used as macvlan port */ | ||
76 | 77 | ||
77 | #define IF_GET_IFACE 0x0001 /* for querying only */ | 78 | #define IF_GET_IFACE 0x0001 /* for querying only */ |
78 | #define IF_GET_PROTO 0x0002 | 79 | #define IF_GET_PROTO 0x0002 |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 361ff1145cf1..5f231de2032f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1049,8 +1049,6 @@ struct net_device { | |||
1049 | 1049 | ||
1050 | /* bridge stuff */ | 1050 | /* bridge stuff */ |
1051 | struct net_bridge_port *br_port; | 1051 | struct net_bridge_port *br_port; |
1052 | /* macvlan */ | ||
1053 | struct macvlan_port *macvlan_port; | ||
1054 | /* GARP */ | 1052 | /* GARP */ |
1055 | struct garp_port *garp_port; | 1053 | struct garp_port *garp_port; |
1056 | 1054 | ||