Commit b596ce68 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hdlc_cisco-cleanups' 



Peng Li says:

====================
net: hdlc_cisco: clean up some code style issues

This patchset clean up some code style issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dd0d91b9 4a20f8ec

drivers/net/wan/hdlc_cisco.c

+14 −35
Original line number Diff line number Diff line
@@ -28,14 +28,12 @@ 
#define CISCO_ADDR_REPLY	1	/* Cisco address reply */

#define CISCO_KEEPALIVE_REQ	2	/* Cisco keepalive request */





struct hdlc_header {

	u8 address;

	u8 control;

	__be16 protocol;

} __packed;





struct cisco_packet {

	__be32 type;		/* code */

	__be32 par1;
@@ -46,7 +44,6 @@ struct cisco_packet { 
#define	CISCO_PACKET_LEN	18

#define	CISCO_BIG_PACKET_LEN	20





struct cisco_state {

	cisco_proto settings;
@@ -59,16 +56,13 @@ struct cisco_state { 
	u32 rxseq; /* RX sequence number */

};





static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr);





static inline struct cisco_state *state(hdlc_device *hdlc)

{

	return (struct cisco_state *)hdlc->state;

}





static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev,

			     u16 type, const void *daddr, const void *saddr,

			     unsigned int len)
@@ -90,8 +84,6 @@ static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev, 
	return sizeof(struct hdlc_header);

}







static void cisco_keepalive_send(struct net_device *dev, u32 type,

				 __be32 par1, __be32 par2)

{
@@ -100,10 +92,9 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type, 


	skb = dev_alloc_skb(sizeof(struct hdlc_header) +

			    sizeof(struct cisco_packet));

	if (!skb) {

		netdev_warn(dev, "Memory squeeze on %s()\n", __func__);

	if (!skb)

		return;

	}



	skb_reserve(skb, 4);

	cisco_hard_header(skb, dev, CISCO_KEEPALIVE, NULL, NULL, 0);

	data = (struct cisco_packet *)(skb->data + 4);
@@ -124,8 +115,6 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type, 
	dev_queue_xmit(skb);

}







static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev)

{

	struct hdlc_header *data = (struct hdlc_header *)skb->data;
@@ -148,7 +137,6 @@ static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev) 
	}

}





static int cisco_rx(struct sk_buff *skb)

{

	struct net_device *dev = skb->dev;
@@ -226,6 +214,7 @@ static int cisco_rx(struct sk_buff *skb) 
				st->last_poll = jiffies;

				if (!st->up) {

					u32 sec, min, hrs, days;



					sec = ntohl(cisco_data->time) / 1000;

					min = sec / 60; sec -= min * 60;

					hrs = min / 60; min -= hrs * 60;
@@ -253,8 +242,6 @@ static int cisco_rx(struct sk_buff *skb) 
	return NET_RX_DROP;

}







static void cisco_timer(struct timer_list *t)

{

	struct cisco_state *st = from_timer(st, t, timer);
@@ -276,8 +263,6 @@ static void cisco_timer(struct timer_list *t) 
	add_timer(&st->timer);

}







static void cisco_start(struct net_device *dev)

{

	hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -294,8 +279,6 @@ static void cisco_start(struct net_device *dev) 
	add_timer(&st->timer);

}







static void cisco_stop(struct net_device *dev)

{

	hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -310,7 +293,6 @@ static void cisco_stop(struct net_device *dev) 
	spin_unlock_irqrestore(&st->lock, flags);

}





static struct hdlc_proto proto = {

	.start		= cisco_start,

	.stop		= cisco_stop,
@@ -359,7 +341,8 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr) 
		    new_settings.timeout < 2)

			return -EINVAL;



		result = hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT);

		result = hdlc->attach(dev, ENCODING_NRZ,

				      PARITY_CRC16_PR1_CCITT);

		if (result)

			return result;
@@ -381,21 +364,17 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr) 
	return -EINVAL;

}





static int __init mod_init(void)

{

	register_hdlc_protocol(&proto);

	return 0;

}







static void __exit mod_exit(void)

{

	unregister_hdlc_protocol(&proto);

}





module_init(mod_init);

module_exit(mod_exit);