diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /net/802 | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'net/802')
| -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 ebcf4830d6..5ce24c4bb8 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c | |||
| @@ -122,10 +122,10 @@ static int fddi_rebuild_header(struct sk_buff *skb) | |||
| 122 | * the proper pointer to the start of packet data (skb->data). | 122 | * the proper pointer to the start of packet data (skb->data). |
| 123 | */ | 123 | */ |
| 124 | 124 | ||
| 125 | unsigned short fddi_type_trans(struct sk_buff *skb, struct net_device *dev) | 125 | __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev) |
| 126 | { | 126 | { |
| 127 | struct fddihdr *fddi = (struct fddihdr *)skb->data; | 127 | struct fddihdr *fddi = (struct fddihdr *)skb->data; |
| 128 | unsigned short type; | 128 | __be16 type; |
| 129 | 129 | ||
| 130 | /* | 130 | /* |
| 131 | * Set mac.raw field to point to FC byte, set data field to point | 131 | * Set mac.raw field to point to FC byte, set data field to point |