tree 3164d78c43159c242b632ce15882c47e69d28c73 parent 208a6dfbd651f3a16c635678a731b419d3d9646f author Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> Fri, 22 Apr 2005 06:46:56 -0700 committer David S. Miller <[EMAIL PROTECTED]> Fri, 22 Apr 2005 06:46:56 -0700
[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 <[EMAIL PROTECTED]> Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> net/ax25.h | 2 +- ax25/af_ax25.c | 4 +--- ax25/ax25_ip.c | 4 +--- ax25/ax25_out.c | 8 +++----- ax25/ax25_subr.c | 4 +--- 5 files changed, 7 insertions(+), 15 deletions(-) Index: include/net/ax25.h =================================================================== --- b391b92b053cb8cfa2e52a7d95c5b1c090009e47/include/net/ax25.h (mode:100644 sha1:fb95ecb6fe0357de875dd66896b4d48a731927d4) +++ 3164d78c43159c242b632ce15882c47e69d28c73/include/net/ax25.h (mode:100644 sha1:875edbba396d2601fce49e8e1c88f90195b56698) @@ -305,7 +305,7 @@ extern ax25_cb *ax25_send_frame(struct s extern void ax25_output(ax25_cb *, int, struct sk_buff *); extern void ax25_kick(ax25_cb *); extern void ax25_transmit_buffer(ax25_cb *, struct sk_buff *, int); -extern void ax25_queue_xmit(struct sk_buff *); +extern void ax25_queue_xmit(struct sk_buff *skb, struct net_device *dev); extern int ax25_check_iframes_acked(ax25_cb *, unsigned short); /* ax25_route.c */ Index: net/ax25/af_ax25.c =================================================================== --- b391b92b053cb8cfa2e52a7d95c5b1c090009e47/net/ax25/af_ax25.c (mode:100644 sha1:33b1a376302702fea9de736808a7923b0695e9b1) +++ 3164d78c43159c242b632ce15882c47e69d28c73/net/ax25/af_ax25.c (mode:100644 sha1:707097deac3deb4957741204c7944e01521f3c0f) @@ -1587,9 +1587,7 @@ static int ax25_sendmsg(struct kiocb *io *asmptr = AX25_UI; /* Datagram frames go straight out of the door as UI */ - skb->dev = ax25->ax25_dev->dev; - - ax25_queue_xmit(skb); + ax25_queue_xmit(skb, ax25->ax25_dev->dev); err = len; Index: net/ax25/ax25_ip.c =================================================================== --- b391b92b053cb8cfa2e52a7d95c5b1c090009e47/net/ax25/ax25_ip.c (mode:100644 sha1:04d711344d559e712f5389315e596684933e1fe1) +++ 3164d78c43159c242b632ce15882c47e69d28c73/net/ax25/ax25_ip.c (mode:100644 sha1:bba0173e2d6500a44954871389fc5e35396dffa2) @@ -199,9 +199,7 @@ int ax25_rebuild_header(struct sk_buff * skb = ourskb; } - skb->dev = dev; - - ax25_queue_xmit(skb); + ax25_queue_xmit(skb, dev); put: ax25_put_route(route); Index: net/ax25/ax25_out.c =================================================================== --- b391b92b053cb8cfa2e52a7d95c5b1c090009e47/net/ax25/ax25_out.c (mode:100644 sha1:3475a3ac9343e38e2d051402f34676b956fd65cf) +++ 3164d78c43159c242b632ce15882c47e69d28c73/net/ax25/ax25_out.c (mode:100644 sha1:94557b1a1fa2acedd47b30c3e51b9733eb02b53a) @@ -340,21 +340,19 @@ void ax25_transmit_buffer(ax25_cb *ax25, ax25_addr_build(ptr, &ax25->source_addr, &ax25->dest_addr, ax25->digipeat, type, ax25->modulus); - skb->dev = ax25->ax25_dev->dev; - - ax25_queue_xmit(skb); + ax25_queue_xmit(skb, ax25->ax25_dev->dev); } /* * A small shim to dev_queue_xmit to add the KISS control byte, and do * any packet forwarding in operation. */ -void ax25_queue_xmit(struct sk_buff *skb) +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(skb->dev); + skb->dev = ax25_fwd_dev(dev); ptr = skb_push(skb, 1); *ptr = 0x00; /* KISS */ Index: net/ax25/ax25_subr.c =================================================================== --- b391b92b053cb8cfa2e52a7d95c5b1c090009e47/net/ax25/ax25_subr.c (mode:100644 sha1:8cf72707af8bbcf7ede4fcf1775887cbe910df6e) +++ 3164d78c43159c242b632ce15882c47e69d28c73/net/ax25/ax25_subr.c (mode:100644 sha1:99694b57f6f565d36f6787f58c8faa43cced25d2) @@ -220,9 +220,7 @@ void ax25_return_dm(struct net_device *d dptr = skb_push(skb, ax25_addr_size(digi)); dptr += ax25_addr_build(dptr, dest, src, &retdigi, AX25_RESPONSE, AX25_MODULUS); - skb->dev = dev; - - ax25_queue_xmit(skb); + ax25_queue_xmit(skb, dev); } /* - To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html