Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iproute2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
iproute2
Commits
1c098687
Commit
1c098687
authored
Dec 03, 2014
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update kernel headers to net-next (3.18-rc6)
Early merge of upstream headers
parent
8322d28d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
4 deletions
+23
-4
include/linux/if_bridge.h
include/linux/if_bridge.h
+1
-0
include/linux/if_link.h
include/linux/if_link.h
+18
-0
include/linux/if_tunnel.h
include/linux/if_tunnel.h
+1
-0
include/linux/neighbour.h
include/linux/neighbour.h
+3
-3
include/linux/rtnetlink.h
include/linux/rtnetlink.h
+0
-1
No files found.
include/linux/if_bridge.h
View file @
1c098687
...
@@ -105,6 +105,7 @@ struct __fdb_entry {
...
@@ -105,6 +105,7 @@ struct __fdb_entry {
#define BRIDGE_MODE_VEB 0
/* Default loopback mode */
#define BRIDGE_MODE_VEB 0
/* Default loopback mode */
#define BRIDGE_MODE_VEPA 1
/* 802.1Qbg defined VEPA mode */
#define BRIDGE_MODE_VEPA 1
/* 802.1Qbg defined VEPA mode */
#define BRIDGE_MODE_SWDEV 2
/* Full switch device offload */
/* Bridge management nested attributes
/* Bridge management nested attributes
* [IFLA_AF_SPEC] = {
* [IFLA_AF_SPEC] = {
...
...
include/linux/if_link.h
View file @
1c098687
...
@@ -145,6 +145,7 @@ enum {
...
@@ -145,6 +145,7 @@ enum {
IFLA_CARRIER
,
IFLA_CARRIER
,
IFLA_PHYS_PORT_ID
,
IFLA_PHYS_PORT_ID
,
IFLA_CARRIER_CHANGES
,
IFLA_CARRIER_CHANGES
,
IFLA_PHYS_SWITCH_ID
,
__IFLA_MAX
__IFLA_MAX
};
};
...
@@ -241,6 +242,8 @@ enum {
...
@@ -241,6 +242,8 @@ enum {
IFLA_BRPORT_FAST_LEAVE
,
/* multicast fast leave */
IFLA_BRPORT_FAST_LEAVE
,
/* multicast fast leave */
IFLA_BRPORT_LEARNING
,
/* mac learning */
IFLA_BRPORT_LEARNING
,
/* mac learning */
IFLA_BRPORT_UNICAST_FLOOD
,
/* flood unicast traffic */
IFLA_BRPORT_UNICAST_FLOOD
,
/* flood unicast traffic */
IFLA_BRPORT_PROXYARP
,
/* proxy ARP */
IFLA_BRPORT_LEARNING_SYNC
,
/* mac learning sync from device */
__IFLA_BRPORT_MAX
__IFLA_BRPORT_MAX
};
};
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
...
@@ -327,6 +330,21 @@ enum macvlan_macaddr_mode {
...
@@ -327,6 +330,21 @@ enum macvlan_macaddr_mode {
#define MACVLAN_FLAG_NOPROMISC 1
#define MACVLAN_FLAG_NOPROMISC 1
/* IPVLAN section */
enum
{
IFLA_IPVLAN_UNSPEC
,
IFLA_IPVLAN_MODE
,
__IFLA_IPVLAN_MAX
};
#define IFLA_IPVLAN_MAX (__IFLA_IPVLAN_MAX - 1)
enum
ipvlan_mode
{
IPVLAN_MODE_L2
=
0
,
IPVLAN_MODE_L3
,
IPVLAN_MODE_MAX
};
/* VXLAN section */
/* VXLAN section */
enum
{
enum
{
IFLA_VXLAN_UNSPEC
,
IFLA_VXLAN_UNSPEC
,
...
...
include/linux/if_tunnel.h
View file @
1c098687
...
@@ -69,6 +69,7 @@ enum tunnel_encap_types {
...
@@ -69,6 +69,7 @@ enum tunnel_encap_types {
#define TUNNEL_ENCAP_FLAG_CSUM (1<<0)
#define TUNNEL_ENCAP_FLAG_CSUM (1<<0)
#define TUNNEL_ENCAP_FLAG_CSUM6 (1<<1)
#define TUNNEL_ENCAP_FLAG_CSUM6 (1<<1)
#define TUNNEL_ENCAP_FLAG_REMCSUM (1<<2)
/* SIT-mode i_flags */
/* SIT-mode i_flags */
#define SIT_ISATAP 0x0001
#define SIT_ISATAP 0x0001
...
...
include/linux/neighbour.h
View file @
1c098687
...
@@ -35,11 +35,11 @@ enum {
...
@@ -35,11 +35,11 @@ enum {
*/
*/
#define NTF_USE 0x01
#define NTF_USE 0x01
#define NTF_PROXY 0x08
/* == ATF_PUBL */
#define NTF_ROUTER 0x80
#define NTF_SELF 0x02
#define NTF_SELF 0x02
#define NTF_MASTER 0x04
#define NTF_MASTER 0x04
#define NTF_PROXY 0x08
/* == ATF_PUBL */
#define NTF_EXT_LEARNED 0x10
#define NTF_ROUTER 0x80
/*
/*
* Neighbor Cache Entry States.
* Neighbor Cache Entry States.
...
...
include/linux/rtnetlink.h
View file @
1c098687
...
@@ -237,7 +237,6 @@ enum {
...
@@ -237,7 +237,6 @@ enum {
#define RTPROT_MROUTED 17
/* Multicast daemon */
#define RTPROT_MROUTED 17
/* Multicast daemon */
#define RTPROT_BABEL 42
/* Babel daemon */
#define RTPROT_BABEL 42
/* Babel daemon */
/* rtm_scope
/* rtm_scope
Really it is not scope, but sort of distance to the destination.
Really it is not scope, but sort of distance to the destination.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment