diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 15:25:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 15:25:59 +0100 |
| commit | 30beab1491f0b96b2f23d3fb68af01fd921a16d8 (patch) | |
| tree | c580bdc0846269fbb10feeda901ecec1a48ee2ef /net/802/fddi.c | |
| parent | 21af6c4f2aa5f63138871b4ddd77d7ebf2588c9d (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
| download | kernel_samsung_smdk4412-30beab1491f0b96b2f23d3fb68af01fd921a16d8.zip kernel_samsung_smdk4412-30beab1491f0b96b2f23d3fb68af01fd921a16d8.tar.gz kernel_samsung_smdk4412-30beab1491f0b96b2f23d3fb68af01fd921a16d8.tar.bz2 | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'net/802/fddi.c')
| -rw-r--r-- | net/802/fddi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/802/fddi.c b/net/802/fddi.c index ebcf483..5ce24c4 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c @@ -122,10 +122,10 @@ static int fddi_rebuild_header(struct sk_buff *skb) * 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; - unsigned short type; + __be16 type; /* * Set mac.raw field to point to FC byte, set data field to point |