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 | |
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')
-rw-r--r-- | net/ax25/af_ax25.c | 4 | ||||
-rw-r--r-- | net/ax25/ax25_ip.c | 4 | ||||
-rw-r--r-- | net/ax25/ax25_out.c | 8 | ||||
-rw-r--r-- | net/ax25/ax25_subr.c | 4 |
4 files changed, 6 insertions, 14 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 33b1a3763027..707097deac3d 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -1587,9 +1587,7 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
1587 | *asmptr = AX25_UI; | 1587 | *asmptr = AX25_UI; |
1588 | 1588 | ||
1589 | /* Datagram frames go straight out of the door as UI */ | 1589 | /* Datagram frames go straight out of the door as UI */ |
1590 | skb->dev = ax25->ax25_dev->dev; | 1590 | ax25_queue_xmit(skb, ax25->ax25_dev->dev); |
1591 | |||
1592 | ax25_queue_xmit(skb); | ||
1593 | 1591 | ||
1594 | err = len; | 1592 | err = len; |
1595 | 1593 | ||
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c index 04d711344d55..bba0173e2d65 100644 --- a/net/ax25/ax25_ip.c +++ b/net/ax25/ax25_ip.c | |||
@@ -199,9 +199,7 @@ int ax25_rebuild_header(struct sk_buff *skb) | |||
199 | skb = ourskb; | 199 | skb = ourskb; |
200 | } | 200 | } |
201 | 201 | ||
202 | skb->dev = dev; | 202 | ax25_queue_xmit(skb, dev); |
203 | |||
204 | ax25_queue_xmit(skb); | ||
205 | 203 | ||
206 | put: | 204 | put: |
207 | ax25_put_route(route); | 205 | ax25_put_route(route); |
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 */ |
diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c index 8cf72707af8b..99694b57f6f5 100644 --- a/net/ax25/ax25_subr.c +++ b/net/ax25/ax25_subr.c | |||
@@ -220,9 +220,7 @@ void ax25_return_dm(struct net_device *dev, ax25_address *src, ax25_address *des | |||
220 | dptr = skb_push(skb, ax25_addr_size(digi)); | 220 | dptr = skb_push(skb, ax25_addr_size(digi)); |
221 | dptr += ax25_addr_build(dptr, dest, src, &retdigi, AX25_RESPONSE, AX25_MODULUS); | 221 | dptr += ax25_addr_build(dptr, dest, src, &retdigi, AX25_RESPONSE, AX25_MODULUS); |
222 | 222 | ||
223 | skb->dev = dev; | 223 | ax25_queue_xmit(skb, dev); |
224 | |||
225 | ax25_queue_xmit(skb); | ||
226 | } | 224 | } |
227 | 225 | ||
228 | /* | 226 | /* |