diff options
author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-04-21 19:46:56 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-04-21 19:46:56 -0400 |
commit | 29c4be51e3fd52205d848248d38924941f22ca0e (patch) | |
tree | 3164d78c43159c242b632ce15882c47e69d28c73 /net/ax25/ax25_out.c | |
parent | 208a6dfbd651f3a16c635678a731b419d3d9646f (diff) |
[AX25]: make ax25_queue_xmit a net_device parameter
I.e. not using skb->dev as a way to pass the parameter used to fill...
skb->dev :-)
Also to get the _type_trans open coded sequence grouped, next changesets
will introduce ax25_type_trans.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25/ax25_out.c')
-rw-r--r-- | net/ax25/ax25_out.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c index 3475a3ac9343..94557b1a1fa2 100644 --- a/net/ax25/ax25_out.c +++ b/net/ax25/ax25_out.c | |||
@@ -340,21 +340,19 @@ void ax25_transmit_buffer(ax25_cb *ax25, struct sk_buff *skb, int type) | |||
340 | 340 | ||
341 | ax25_addr_build(ptr, &ax25->source_addr, &ax25->dest_addr, ax25->digipeat, type, ax25->modulus); | 341 | ax25_addr_build(ptr, &ax25->source_addr, &ax25->dest_addr, ax25->digipeat, type, ax25->modulus); |
342 | 342 | ||
343 | skb->dev = ax25->ax25_dev->dev; | 343 | ax25_queue_xmit(skb, ax25->ax25_dev->dev); |
344 | |||
345 | ax25_queue_xmit(skb); | ||
346 | } | 344 | } |
347 | 345 | ||
348 | /* | 346 | /* |
349 | * A small shim to dev_queue_xmit to add the KISS control byte, and do | 347 | * A small shim to dev_queue_xmit to add the KISS control byte, and do |
350 | * any packet forwarding in operation. | 348 | * any packet forwarding in operation. |
351 | */ | 349 | */ |
352 | void ax25_queue_xmit(struct sk_buff *skb) | 350 | void ax25_queue_xmit(struct sk_buff *skb, struct net_device *dev) |
353 | { | 351 | { |
354 | unsigned char *ptr; | 352 | unsigned char *ptr; |
355 | 353 | ||
356 | skb->protocol = htons(ETH_P_AX25); | 354 | skb->protocol = htons(ETH_P_AX25); |
357 | skb->dev = ax25_fwd_dev(skb->dev); | 355 | skb->dev = ax25_fwd_dev(dev); |
358 | 356 | ||
359 | ptr = skb_push(skb, 1); | 357 | ptr = skb_push(skb, 1); |
360 | *ptr = 0x00; /* KISS */ | 358 | *ptr = 0x00; /* KISS */ |