git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.26' of git://neil.brown.name/md
[pandora-kernel.git]
/
include
/
net
/
inet_ecn.h
diff --git
a/include/net/inet_ecn.h
b/include/net/inet_ecn.h
index
ba33db0
..
7040a78
100644
(file)
--- a/
include/net/inet_ecn.h
+++ b/
include/net/inet_ecn.h
@@
-47,7
+47,7
@@
static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
} while (0)
#define IP6_ECN_flow_xmit(sk, label) do { \
- if (INET_ECN_is_capable(inet
_sk(sk)->tos))
\
+ if (INET_ECN_is_capable(inet
6_sk(sk)->tclass))
\
(label) |= htonl(INET_ECN_ECT_0 << 20); \
} while (0)