diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-04-24 18:53:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-04-24 18:53:06 -0700 |
| commit | 56cb515628e6a831bb76783f282a71f7285dad33 (patch) | |
| tree | ef7a70e6269eaf6f616066b6e1cd718a394d94bb /net/ax25 | |
| parent | 3b2d59d1fc86cc7217f165100a939907802dc67c (diff) | |
| download | blackbird-obmc-linux-56cb515628e6a831bb76783f282a71f7285dad33.tar.gz blackbird-obmc-linux-56cb515628e6a831bb76783f282a71f7285dad33.zip | |
[AX25] Introduce ax25_type_trans
Replacing the open coded equivalents and making ax25 look more like
a linux network protocol, i.e. more similar to inet.
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/ax25_ds_subr.c | 3 | ||||
| -rw-r--r-- | net/ax25/ax25_out.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c index 10ffd2beba3f..1d4ab641f82b 100644 --- a/net/ax25/ax25_ds_subr.c +++ b/net/ax25/ax25_ds_subr.c @@ -143,8 +143,7 @@ static void ax25_kiss_cmd(ax25_dev *ax25_dev, unsigned char cmd, unsigned char p *p++ = cmd; *p++ = param; - skb->dev = ax25_dev->dev; - skb->protocol = htons(ETH_P_AX25); + skb->protocol = ax25_type_trans(skb, ax25_dev->dev); dev_queue_xmit(skb); } diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c index 94557b1a1fa2..5fc048dcd39a 100644 --- a/net/ax25/ax25_out.c +++ b/net/ax25/ax25_out.c @@ -351,8 +351,7 @@ void ax25_queue_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned char *ptr; - skb->protocol = htons(ETH_P_AX25); - skb->dev = ax25_fwd_dev(dev); + skb->protocol = ax25_type_trans(skb, ax25_fwd_dev(dev)); ptr = skb_push(skb, 1); *ptr = 0x00; /* KISS */ |
