Commit 5abaf211 authored by Peng Li's avatar Peng Li Committed by David S. Miller

net: hdlc_cisco: remove redundant blank lines

This patch removes some redundant blank lines.
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd0d91b9
...@@ -28,14 +28,12 @@ ...@@ -28,14 +28,12 @@
#define CISCO_ADDR_REPLY 1 /* Cisco address reply */ #define CISCO_ADDR_REPLY 1 /* Cisco address reply */
#define CISCO_KEEPALIVE_REQ 2 /* Cisco keepalive request */ #define CISCO_KEEPALIVE_REQ 2 /* Cisco keepalive request */
struct hdlc_header { struct hdlc_header {
u8 address; u8 address;
u8 control; u8 control;
__be16 protocol; __be16 protocol;
}__packed; }__packed;
struct cisco_packet { struct cisco_packet {
__be32 type; /* code */ __be32 type; /* code */
__be32 par1; __be32 par1;
...@@ -46,7 +44,6 @@ struct cisco_packet { ...@@ -46,7 +44,6 @@ struct cisco_packet {
#define CISCO_PACKET_LEN 18 #define CISCO_PACKET_LEN 18
#define CISCO_BIG_PACKET_LEN 20 #define CISCO_BIG_PACKET_LEN 20
struct cisco_state { struct cisco_state {
cisco_proto settings; cisco_proto settings;
...@@ -59,16 +56,13 @@ struct cisco_state { ...@@ -59,16 +56,13 @@ struct cisco_state {
u32 rxseq; /* RX sequence number */ u32 rxseq; /* RX sequence number */
}; };
static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr); static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr);
static inline struct cisco_state* state(hdlc_device *hdlc) static inline struct cisco_state* state(hdlc_device *hdlc)
{ {
return (struct cisco_state *)hdlc->state; return (struct cisco_state *)hdlc->state;
} }
static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev, static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev,
u16 type, const void *daddr, const void *saddr, u16 type, const void *daddr, const void *saddr,
unsigned int len) unsigned int len)
...@@ -90,8 +84,6 @@ static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev, ...@@ -90,8 +84,6 @@ static int cisco_hard_header(struct sk_buff *skb, struct net_device *dev,
return sizeof(struct hdlc_header); return sizeof(struct hdlc_header);
} }
static void cisco_keepalive_send(struct net_device *dev, u32 type, static void cisco_keepalive_send(struct net_device *dev, u32 type,
__be32 par1, __be32 par2) __be32 par1, __be32 par2)
{ {
...@@ -124,8 +116,6 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type, ...@@ -124,8 +116,6 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
dev_queue_xmit(skb); dev_queue_xmit(skb);
} }
static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev) static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct hdlc_header *data = (struct hdlc_header*)skb->data; struct hdlc_header *data = (struct hdlc_header*)skb->data;
...@@ -148,7 +138,6 @@ static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -148,7 +138,6 @@ static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev)
} }
} }
static int cisco_rx(struct sk_buff *skb) static int cisco_rx(struct sk_buff *skb)
{ {
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
...@@ -253,8 +242,6 @@ static int cisco_rx(struct sk_buff *skb) ...@@ -253,8 +242,6 @@ static int cisco_rx(struct sk_buff *skb)
return NET_RX_DROP; return NET_RX_DROP;
} }
static void cisco_timer(struct timer_list *t) static void cisco_timer(struct timer_list *t)
{ {
struct cisco_state *st = from_timer(st, t, timer); struct cisco_state *st = from_timer(st, t, timer);
...@@ -276,8 +263,6 @@ static void cisco_timer(struct timer_list *t) ...@@ -276,8 +263,6 @@ static void cisco_timer(struct timer_list *t)
add_timer(&st->timer); add_timer(&st->timer);
} }
static void cisco_start(struct net_device *dev) static void cisco_start(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -294,8 +279,6 @@ static void cisco_start(struct net_device *dev) ...@@ -294,8 +279,6 @@ static void cisco_start(struct net_device *dev)
add_timer(&st->timer); add_timer(&st->timer);
} }
static void cisco_stop(struct net_device *dev) static void cisco_stop(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -310,7 +293,6 @@ static void cisco_stop(struct net_device *dev) ...@@ -310,7 +293,6 @@ static void cisco_stop(struct net_device *dev)
spin_unlock_irqrestore(&st->lock, flags); spin_unlock_irqrestore(&st->lock, flags);
} }
static struct hdlc_proto proto = { static struct hdlc_proto proto = {
.start = cisco_start, .start = cisco_start,
.stop = cisco_stop, .stop = cisco_stop,
...@@ -381,21 +363,17 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr) ...@@ -381,21 +363,17 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)
return -EINVAL; return -EINVAL;
} }
static int __init mod_init(void) static int __init mod_init(void)
{ {
register_hdlc_protocol(&proto); register_hdlc_protocol(&proto);
return 0; return 0;
} }
static void __exit mod_exit(void) static void __exit mod_exit(void)
{ {
unregister_hdlc_protocol(&proto); unregister_hdlc_protocol(&proto);
} }
module_init(mod_init); module_init(mod_init);
module_exit(mod_exit); module_exit(mod_exit);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment