diff options
Diffstat (limited to 'include/linux')
-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 31f2e27ebcd0..53558ec59e1b 100644 --- a/include/linux/if.h +++ b/include/linux/if.h | |||
@@ -74,6 +74,7 @@ | |||
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 | #define IFF_MACVLAN_PORT 0x4000 /* device used as macvlan port */ |
77 | #define IFF_BRIDGE_PORT 0x8000 /* device used as bridge port */ | ||
77 | 78 | ||
78 | #define IF_GET_IFACE 0x0001 /* for querying only */ | 79 | #define IF_GET_IFACE 0x0001 /* for querying only */ |
79 | #define IF_GET_PROTO 0x0002 | 80 | #define IF_GET_PROTO 0x0002 |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5f231de2032f..a7e0458029b5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1047,8 +1047,6 @@ struct net_device { | |||
1047 | /* mid-layer private */ | 1047 | /* mid-layer private */ |
1048 | void *ml_priv; | 1048 | void *ml_priv; |
1049 | 1049 | ||
1050 | /* bridge stuff */ | ||
1051 | struct net_bridge_port *br_port; | ||
1052 | /* GARP */ | 1050 | /* GARP */ |
1053 | struct garp_port *garp_port; | 1051 | struct garp_port *garp_port; |
1054 | 1052 | ||