projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
include
/
uapi
/
linux
/
if_bridge.h
diff --git
a/include/uapi/linux/if_bridge.h
b/include/uapi/linux/if_bridge.h
index
c186f64
..
ab92bca
100644
(file)
--- a/
include/uapi/linux/if_bridge.h
+++ b/
include/uapi/linux/if_bridge.h
@@
-140,7
+140,7
@@
struct bridge_vlan_xstats {
__u64 tx_bytes;
__u64 tx_packets;
__u16 vid;
- __u16
pad1
;
+ __u16
flags
;
__u32 pad2;
};