git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
ipx
/
ipx_route.c
diff --git
a/net/ipx/ipx_route.c
b/net/ipx/ipx_route.c
index
a394c6f
..
a30dbb1
100644
(file)
--- a/
net/ipx/ipx_route.c
+++ b/
net/ipx/ipx_route.c
@@
-7,7
+7,6
@@
* See net/ipx/ChangeLog.
*/
* See net/ipx/ChangeLog.
*/
-#include <linux/config.h>
#include <linux/list.h>
#include <linux/route.h>
#include <linux/spinlock.h>
#include <linux/list.h>
#include <linux/route.h>
#include <linux/spinlock.h>
@@
-238,7
+237,7
@@
int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx,
}
/* Apply checksum. Not allowed on 802.3 links. */
}
/* Apply checksum. Not allowed on 802.3 links. */
- if (sk->sk_no_check || intrfc->if_dlink_type ==
IPX_FRAME_8023
)
+ if (sk->sk_no_check || intrfc->if_dlink_type ==
htons(IPX_FRAME_8023)
)
ipx->ipx_checksum = 0xFFFF;
else
ipx->ipx_checksum = ipx_cksum(ipx, len + sizeof(struct ipxhdr));
ipx->ipx_checksum = 0xFFFF;
else
ipx->ipx_checksum = ipx_cksum(ipx, len + sizeof(struct ipxhdr));