diff options
| author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 07:39:41 -0700 |
|---|---|---|
| committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 07:39:41 -0700 |
| commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
| tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /include/net/ax25.h | |
| parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
| parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/net/ax25.h')
| -rw-r--r-- | include/net/ax25.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 9e6368a5454..828a3a93dda 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -220,7 +220,7 @@ static __inline__ void ax25_cb_put(ax25_cb *ax25) } } -static inline unsigned short ax25_type_trans(struct sk_buff *skb, struct net_device *dev) +static inline __be16 ax25_type_trans(struct sk_buff *skb, struct net_device *dev) { skb->dev = dev; skb->pkt_type = PACKET_HOST; |