diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 12:15:17 -0400 |
| commit | f3efbe582b5396d134024c03a5fa253f2a85d9a6 (patch) | |
| tree | e4e15b7567b82d24cb1e7327398286a2b88df04c /net/tipc | |
| parent | 05d3ed0a1fe3ea05ab9f3b8d32576a0bc2e19660 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/subscr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index 0326d3060bc7..0747d8a9232f 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c | |||
| @@ -85,7 +85,7 @@ static struct top_srv topsrv = { 0 }; | |||
| 85 | 85 | ||
| 86 | static u32 htohl(u32 in, int swap) | 86 | static u32 htohl(u32 in, int swap) |
| 87 | { | 87 | { |
| 88 | return swap ? (u32)___constant_swab32(in) : in; | 88 | return swap ? swab32(in) : in; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | /** | 91 | /** |