diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-14 01:11:44 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-14 01:11:44 +0200 |
| commit | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch) | |
| tree | 6fdb546c151410851fd3c604d42590afa4215084 /net/802/fddi.c | |
| parent | Merge /spare/repo/netdev-2.6 branch 'ieee80211' (diff) | |
| parent | Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff) | |
| download | linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
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 ebcf4830d6f1..5ce24c4bb840 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 |