aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2005-04-24 21:53:06 -0400
committerDavid S. Miller <davem@davemloft.net>2005-04-24 21:53:06 -0400
commit56cb515628e6a831bb76783f282a71f7285dad33 (patch)
treeef7a70e6269eaf6f616066b6e1cd718a394d94bb /net
parent3b2d59d1fc86cc7217f165100a939907802dc67c (diff)
[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')
-rw-r--r--net/ax25/ax25_ds_subr.c3
-rw-r--r--net/ax25/ax25_out.c3
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
143 *p++ = cmd; 143 *p++ = cmd;
144 *p++ = param; 144 *p++ = param;
145 145
146 skb->dev = ax25_dev->dev; 146 skb->protocol = ax25_type_trans(skb, ax25_dev->dev);
147 skb->protocol = htons(ETH_P_AX25);
148 147
149 dev_queue_xmit(skb); 148 dev_queue_xmit(skb);
150} 149}
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)
351{ 351{
352 unsigned char *ptr; 352 unsigned char *ptr;
353 353
354 skb->protocol = htons(ETH_P_AX25); 354 skb->protocol = ax25_type_trans(skb, ax25_fwd_dev(dev));
355 skb->dev = ax25_fwd_dev(dev);
356 355
357 ptr = skb_push(skb, 1); 356 ptr = skb_push(skb, 1);
358 *ptr = 0x00; /* KISS */ 357 *ptr = 0x00; /* KISS */