projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbf8f7b
)
nf_bridge: remove holes in struct nf_bridge_info
author
Eric Dumazet
<
[email protected]
>
Wed, 18 Apr 2012 23:19:25 +0000
(23:19 +0000)
committer
David S. Miller
<
[email protected]
>
Thu, 19 Apr 2012 19:18:50 +0000
(15:18 -0400)
Put use & mask on same location to avoid two holes on 64bit arches
Signed-off-by: Eric Dumazet <
[email protected]
>
Acked-by: Stephen Hemminger <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
include/linux/skbuff.h
patch
|
blob
|
history
diff --git
a/include/linux/skbuff.h
b/include/linux/skbuff.h
index 775292a66fa4d84615e2b3d3d15c84913cc7813b..f25795ca675391fb529a0ba9e45d7d18cfaaa417 100644
(file)
--- a/
include/linux/skbuff.h
+++ b/
include/linux/skbuff.h
@@
-117,11
+117,11
@@
struct nf_conntrack {
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info {
- atomic_t use;
-
struct net_device *physindev
;
- struct net_device
*physout
dev;
-
unsigned int mask
;
- unsigned long data[32 / sizeof(unsigned long)];
+ atomic_t
use;
+
unsigned int mask
;
+ struct net_device
*physin
dev;
+
struct net_device *physoutdev
;
+ unsigned long
data[32 / sizeof(unsigned long)];
};
#endif