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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
802
/
fddi.c
diff --git
a/net/802/fddi.c
b/net/802/fddi.c
index
ebcf483
..
ac242a4
100644
(file)
--- a/
net/802/fddi.c
+++ b/
net/802/fddi.c
@@
-108,8
+108,8
@@
static int fddi_rebuild_header(struct sk_buff *skb)
else
#endif
{
else
#endif
{
- printk("%s: Don't know how to resolve type %0
2
X addresses.\n",
- skb->dev->name,
hton
s(fddi->hdr.llc_snap.ethertype));
+ printk("%s: Don't know how to resolve type %0
4
X addresses.\n",
+ skb->dev->name,
ntoh
s(fddi->hdr.llc_snap.ethertype));
return(0);
}
}
return(0);
}
}
@@
-122,10
+122,10
@@
static int fddi_rebuild_header(struct sk_buff *skb)
* the proper pointer to the start of packet data (skb->data).
*/
* the proper pointer to the start of packet data (skb->data).
*/
-
unsigned short
fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
+
__be16
fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct fddihdr *fddi = (struct fddihdr *)skb->data;
{
struct fddihdr *fddi = (struct fddihdr *)skb->data;
-
unsigned short
type;
+
__be16
type;
/*
* Set mac.raw field to point to FC byte, set data field to point
/*
* Set mac.raw field to point to FC byte, set data field to point