Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0da529a7 authored by Daniel Mack's avatar Daniel Mack Committed by David S. Miller
Browse files

drivers/net/arcnet/capmode.c: clean up code 



 - shuffle around functions to get rid of forward declarations
 - fix some CodingStyle and indentation issues
 - last but not least, get rid of the following CONFIG_MODULE=n warning:

	drivers/net/arcnet/capmode.c:52: warning: ‘capmode_proto’ defined but not used

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38117d14

drivers/net/arcnet/capmode.c

+78 −99
Original line number Original line Diff line number Diff line
@@ -37,69 +37,6 @@ 




#define VERSION "arcnet: cap mode (`c') encapsulation support loaded.\n"

#define VERSION "arcnet: cap mode (`c') encapsulation support loaded.\n"







static void rx(struct net_device *dev, int bufnum,

	       struct archdr *pkthdr, int length);

static int build_header(struct sk_buff *skb,

			struct net_device *dev,

			unsigned short type,

			uint8_t daddr);

static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,

		      int bufnum);

static int ack_tx(struct net_device *dev, int acked);





static struct ArcProto capmode_proto =

{

	'r',

	XMTU,

	0,

       	rx,

	build_header,

	prepare_tx,

	NULL,

	ack_tx

};





static void arcnet_cap_init(void)

{

	int count;



	for (count = 1; count <= 8; count++)

		if (arc_proto_map[count] == arc_proto_default)

			arc_proto_map[count] = &capmode_proto;



	/* for cap mode, we only set the bcast proto if there's no better one */

	if (arc_bcast_proto == arc_proto_default)

		arc_bcast_proto = &capmode_proto;



	arc_proto_default = &capmode_proto;

	arc_raw_proto = &capmode_proto;

}





#ifdef MODULE



static int __init capmode_module_init(void)

{

	printk(VERSION);

	arcnet_cap_init();

	return 0;

}



static void __exit capmode_module_exit(void)

{

	arcnet_unregister_proto(&capmode_proto);

}

module_init(capmode_module_init);

module_exit(capmode_module_exit);



MODULE_LICENSE("GPL");

#endif				/* MODULE */







/* packet receiver */

/* packet receiver */

static void rx(struct net_device *dev, int bufnum,

static void rx(struct net_device *dev, int bufnum,

	       struct archdr *pkthdr, int length)

	       struct archdr *pkthdr, int length)
@@ -231,13 +168,13 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, 
	BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",

	BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",

	       length,ofs);

	       length,ofs);





	// Copy the arcnet-header + the protocol byte down:

	/* Copy the arcnet-header + the protocol byte down: */

	lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE);

	lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE);

	lp->hw.copy_to_card(dev, bufnum, ofs, &pkt->soft.cap.proto,

	lp->hw.copy_to_card(dev, bufnum, ofs, &pkt->soft.cap.proto,

			    sizeof(pkt->soft.cap.proto));

			    sizeof(pkt->soft.cap.proto));





	// Skip the extra integer we have written into it as a cookie

	/* Skip the extra integer we have written into it as a cookie

	// but write the rest of the message:

	   but write the rest of the message: */

	lp->hw.copy_to_card(dev, bufnum, ofs+1,

	lp->hw.copy_to_card(dev, bufnum, ofs+1,

			    ((unsigned char*)&pkt->soft.cap.mes),length-1);

			    ((unsigned char*)&pkt->soft.cap.mes),length-1);
@@ -246,7 +183,6 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, 
	return 1;	/* done */

	return 1;	/* done */

}

}







static int ack_tx(struct net_device *dev, int acked)

static int ack_tx(struct net_device *dev, int acked)

{

{

	struct arcnet_local *lp = netdev_priv(dev);

	struct arcnet_local *lp = netdev_priv(dev);
@@ -273,7 +209,6 @@ static int ack_tx(struct net_device *dev, int acked) 
	ackpkt = (struct archdr *)skb_mac_header(ackskb);

	ackpkt = (struct archdr *)skb_mac_header(ackskb);

	/* skb_pull(ackskb, ARC_HDR_SIZE); */

	/* skb_pull(ackskb, ARC_HDR_SIZE); */







	skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,

	skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,

				  ARC_HDR_SIZE + sizeof(struct arc_cap));

				  ARC_HDR_SIZE + sizeof(struct arc_cap));

	ackpkt->soft.cap.proto = 0; /* using protocol 0 for acknowledge */

	ackpkt->soft.cap.proto = 0; /* using protocol 0 for acknowledge */
@@ -293,3 +228,47 @@ static int ack_tx(struct net_device *dev, int acked) 




	return 0;

	return 0;

}

}



static struct ArcProto capmode_proto =

{

	'r',

	XMTU,

	0,

	rx,

	build_header,

	prepare_tx,

	NULL,

	ack_tx

};



static void arcnet_cap_init(void)

{

	int count;



	for (count = 1; count <= 8; count++)

		if (arc_proto_map[count] == arc_proto_default)

			arc_proto_map[count] = &capmode_proto;



	/* for cap mode, we only set the bcast proto if there's no better one */

	if (arc_bcast_proto == arc_proto_default)

		arc_bcast_proto = &capmode_proto;



	arc_proto_default = &capmode_proto;

	arc_raw_proto = &capmode_proto;

}



static int __init capmode_module_init(void)

{

	printk(VERSION);

	arcnet_cap_init();

	return 0;

}



static void __exit capmode_module_exit(void)

{

	arcnet_unregister_proto(&capmode_proto);

}

module_init(capmode_module_init);

module_exit(capmode_module_exit);



MODULE_LICENSE("GPL");