diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
commit | cb18eccff48ef3986d1072964590bce6fec705fb (patch) | |
tree | 777fb1d15e0281341e1e02c9803d989538d346f2 /net/wanrouter/wanproc.c | |
parent | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (diff) | |
parent | 5ef213f6842277ee1df5659f59fac0ffc9beb411 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
[IPV4]: Restore multipath routing after rt_next changes.
[XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
[NET]: Reorder fields of struct dst_entry
[DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
[IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
[NET]: Introduce union in struct dst_entry to hold 'next' pointer
[DECNET]: fix misannotation of linkinfo_dn
[DECNET]: FRA_{DST,SRC} are le16 for decnet
[UDP]: UDP can use sk_hash to speedup lookups
[NET]: Fix whitespace errors.
[NET] XFRM: Fix whitespace errors.
[NET] X25: Fix whitespace errors.
[NET] WANROUTER: Fix whitespace errors.
[NET] UNIX: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] SCHED: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
...
Diffstat (limited to 'net/wanrouter/wanproc.c')
-rw-r--r-- | net/wanrouter/wanproc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c index 930ea59463a..abce8287360 100644 --- a/net/wanrouter/wanproc.c +++ b/net/wanrouter/wanproc.c | |||
@@ -37,10 +37,10 @@ | |||
37 | 37 | ||
38 | #define PROT_DECODE(prot) ((prot == WANCONFIG_FR) ? " FR" :\ | 38 | #define PROT_DECODE(prot) ((prot == WANCONFIG_FR) ? " FR" :\ |
39 | (prot == WANCONFIG_X25) ? " X25" : \ | 39 | (prot == WANCONFIG_X25) ? " X25" : \ |
40 | (prot == WANCONFIG_PPP) ? " PPP" : \ | 40 | (prot == WANCONFIG_PPP) ? " PPP" : \ |
41 | (prot == WANCONFIG_CHDLC) ? " CHDLC": \ | 41 | (prot == WANCONFIG_CHDLC) ? " CHDLC": \ |
42 | (prot == WANCONFIG_MPPP) ? " MPPP" : \ | 42 | (prot == WANCONFIG_MPPP) ? " MPPP" : \ |
43 | " Unknown" ) | 43 | " Unknown" ) |
44 | 44 | ||
45 | /****** Function Prototypes *************************************************/ | 45 | /****** Function Prototypes *************************************************/ |
46 | 46 | ||