Commit b11faec3 authored by Peng Li's avatar Peng Li Committed by Jakub Kicinski

net: hdlc_fr: 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 avatarJakub Kicinski <kuba@kernel.org>
parent f6bb63cd
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
#define NLPID_CCITT_ANSI_LMI 0x08 #define NLPID_CCITT_ANSI_LMI 0x08
#define NLPID_CISCO_LMI 0x09 #define NLPID_CISCO_LMI 0x09
#define LMI_CCITT_ANSI_DLCI 0 /* LMI DLCI */ #define LMI_CCITT_ANSI_DLCI 0 /* LMI DLCI */
#define LMI_CISCO_DLCI 1023 #define LMI_CISCO_DLCI 1023
...@@ -86,7 +85,6 @@ ...@@ -86,7 +85,6 @@
#define LMI_CCITT_CISCO_LENGTH 13 /* LMI frame lengths */ #define LMI_CCITT_CISCO_LENGTH 13 /* LMI frame lengths */
#define LMI_ANSI_LENGTH 14 #define LMI_ANSI_LENGTH 14
struct fr_hdr { struct fr_hdr {
#if defined(__LITTLE_ENDIAN_BITFIELD) #if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned ea1: 1; unsigned ea1: 1;
...@@ -111,7 +109,6 @@ struct fr_hdr { ...@@ -111,7 +109,6 @@ struct fr_hdr {
#endif #endif
} __packed; } __packed;
struct pvc_device { struct pvc_device {
struct net_device *frad; struct net_device *frad;
struct net_device *main; struct net_device *main;
...@@ -149,29 +146,24 @@ struct frad_state { ...@@ -149,29 +146,24 @@ struct frad_state {
u8 rxseq; /* RX sequence number */ u8 rxseq; /* RX sequence number */
}; };
static int fr_ioctl(struct net_device *dev, struct ifreq *ifr); static int fr_ioctl(struct net_device *dev, struct ifreq *ifr);
static inline u16 q922_to_dlci(u8 *hdr) static inline u16 q922_to_dlci(u8 *hdr)
{ {
return ((hdr[0] & 0xFC) << 2) | ((hdr[1] & 0xF0) >> 4); return ((hdr[0] & 0xFC) << 2) | ((hdr[1] & 0xF0) >> 4);
} }
static inline void dlci_to_q922(u8 *hdr, u16 dlci) static inline void dlci_to_q922(u8 *hdr, u16 dlci)
{ {
hdr[0] = (dlci >> 2) & 0xFC; hdr[0] = (dlci >> 2) & 0xFC;
hdr[1] = ((dlci << 4) & 0xF0) | 0x01; hdr[1] = ((dlci << 4) & 0xF0) | 0x01;
} }
static inline struct frad_state* state(hdlc_device *hdlc) static inline struct frad_state* state(hdlc_device *hdlc)
{ {
return(struct frad_state *)(hdlc->state); return(struct frad_state *)(hdlc->state);
} }
static inline struct pvc_device *find_pvc(hdlc_device *hdlc, u16 dlci) static inline struct pvc_device *find_pvc(hdlc_device *hdlc, u16 dlci)
{ {
struct pvc_device *pvc = state(hdlc)->first_pvc; struct pvc_device *pvc = state(hdlc)->first_pvc;
...@@ -187,7 +179,6 @@ static inline struct pvc_device *find_pvc(hdlc_device *hdlc, u16 dlci) ...@@ -187,7 +179,6 @@ static inline struct pvc_device *find_pvc(hdlc_device *hdlc, u16 dlci)
return NULL; return NULL;
} }
static struct pvc_device *add_pvc(struct net_device *dev, u16 dlci) static struct pvc_device *add_pvc(struct net_device *dev, u16 dlci)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -215,13 +206,11 @@ static struct pvc_device *add_pvc(struct net_device *dev, u16 dlci) ...@@ -215,13 +206,11 @@ static struct pvc_device *add_pvc(struct net_device *dev, u16 dlci)
return pvc; return pvc;
} }
static inline int pvc_is_used(struct pvc_device *pvc) static inline int pvc_is_used(struct pvc_device *pvc)
{ {
return pvc->main || pvc->ether; return pvc->main || pvc->ether;
} }
static inline void pvc_carrier(int on, struct pvc_device *pvc) static inline void pvc_carrier(int on, struct pvc_device *pvc)
{ {
if (on) { if (on) {
...@@ -241,7 +230,6 @@ static inline void pvc_carrier(int on, struct pvc_device *pvc) ...@@ -241,7 +230,6 @@ static inline void pvc_carrier(int on, struct pvc_device *pvc)
} }
} }
static inline void delete_unused_pvcs(hdlc_device *hdlc) static inline void delete_unused_pvcs(hdlc_device *hdlc)
{ {
struct pvc_device **pvc_p = &state(hdlc)->first_pvc; struct pvc_device **pvc_p = &state(hdlc)->first_pvc;
...@@ -260,7 +248,6 @@ static inline void delete_unused_pvcs(hdlc_device *hdlc) ...@@ -260,7 +248,6 @@ static inline void delete_unused_pvcs(hdlc_device *hdlc)
} }
} }
static inline struct net_device **get_dev_p(struct pvc_device *pvc, static inline struct net_device **get_dev_p(struct pvc_device *pvc,
int type) int type)
{ {
...@@ -270,7 +257,6 @@ static inline struct net_device **get_dev_p(struct pvc_device *pvc, ...@@ -270,7 +257,6 @@ static inline struct net_device **get_dev_p(struct pvc_device *pvc,
return &pvc->main; return &pvc->main;
} }
static int fr_hard_header(struct sk_buff *skb, u16 dlci) static int fr_hard_header(struct sk_buff *skb, u16 dlci)
{ {
if (!skb->dev) { /* Control packets */ if (!skb->dev) { /* Control packets */
...@@ -334,8 +320,6 @@ static int fr_hard_header(struct sk_buff *skb, u16 dlci) ...@@ -334,8 +320,6 @@ static int fr_hard_header(struct sk_buff *skb, u16 dlci)
return 0; return 0;
} }
static int pvc_open(struct net_device *dev) static int pvc_open(struct net_device *dev)
{ {
struct pvc_device *pvc = dev->ml_priv; struct pvc_device *pvc = dev->ml_priv;
...@@ -354,8 +338,6 @@ static int pvc_open(struct net_device *dev) ...@@ -354,8 +338,6 @@ static int pvc_open(struct net_device *dev)
return 0; return 0;
} }
static int pvc_close(struct net_device *dev) static int pvc_close(struct net_device *dev)
{ {
struct pvc_device *pvc = dev->ml_priv; struct pvc_device *pvc = dev->ml_priv;
...@@ -373,8 +355,6 @@ static int pvc_close(struct net_device *dev) ...@@ -373,8 +355,6 @@ static int pvc_close(struct net_device *dev)
return 0; return 0;
} }
static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
struct pvc_device *pvc = dev->ml_priv; struct pvc_device *pvc = dev->ml_priv;
...@@ -465,15 +445,12 @@ static inline void fr_log_dlci_active(struct pvc_device *pvc) ...@@ -465,15 +445,12 @@ static inline void fr_log_dlci_active(struct pvc_device *pvc)
pvc->state.active ? "active" : "inactive"); pvc->state.active ? "active" : "inactive");
} }
static inline u8 fr_lmi_nextseq(u8 x) static inline u8 fr_lmi_nextseq(u8 x)
{ {
x++; x++;
return x ? x : 1; return x ? x : 1;
} }
static void fr_lmi_send(struct net_device *dev, int fullrep) static void fr_lmi_send(struct net_device *dev, int fullrep)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -569,8 +546,6 @@ static void fr_lmi_send(struct net_device *dev, int fullrep) ...@@ -569,8 +546,6 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
dev_queue_xmit(skb); dev_queue_xmit(skb);
} }
static void fr_set_link_state(int reliable, struct net_device *dev) static void fr_set_link_state(int reliable, struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -603,7 +578,6 @@ static void fr_set_link_state(int reliable, struct net_device *dev) ...@@ -603,7 +578,6 @@ static void fr_set_link_state(int reliable, struct net_device *dev)
} }
} }
static void fr_timer(struct timer_list *t) static void fr_timer(struct timer_list *t)
{ {
struct frad_state *st = from_timer(st, t, timer); struct frad_state *st = from_timer(st, t, timer);
...@@ -655,7 +629,6 @@ static void fr_timer(struct timer_list *t) ...@@ -655,7 +629,6 @@ static void fr_timer(struct timer_list *t)
add_timer(&state(hdlc)->timer); add_timer(&state(hdlc)->timer);
} }
static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb) static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -962,7 +935,6 @@ static int fr_rx(struct sk_buff *skb) ...@@ -962,7 +935,6 @@ static int fr_rx(struct sk_buff *skb)
pvc->state.becn ^= 1; pvc->state.becn ^= 1;
} }
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) { if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
frad->stats.rx_dropped++; frad->stats.rx_dropped++;
return NET_RX_DROP; return NET_RX_DROP;
...@@ -1018,8 +990,6 @@ static int fr_rx(struct sk_buff *skb) ...@@ -1018,8 +990,6 @@ static int fr_rx(struct sk_buff *skb)
return NET_RX_DROP; return NET_RX_DROP;
} }
static void fr_start(struct net_device *dev) static void fr_start(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -1044,7 +1014,6 @@ static void fr_start(struct net_device *dev) ...@@ -1044,7 +1014,6 @@ static void fr_start(struct net_device *dev)
fr_set_link_state(1, dev); fr_set_link_state(1, dev);
} }
static void fr_stop(struct net_device *dev) static void fr_stop(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -1056,7 +1025,6 @@ static void fr_stop(struct net_device *dev) ...@@ -1056,7 +1025,6 @@ static void fr_stop(struct net_device *dev)
fr_set_link_state(0, dev); fr_set_link_state(0, dev);
} }
static void fr_close(struct net_device *dev) static void fr_close(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
...@@ -1071,7 +1039,6 @@ static void fr_close(struct net_device *dev) ...@@ -1071,7 +1039,6 @@ static void fr_close(struct net_device *dev)
} }
} }
static void pvc_setup(struct net_device *dev) static void pvc_setup(struct net_device *dev)
{ {
dev->type = ARPHRD_DLCI; dev->type = ARPHRD_DLCI;
...@@ -1147,8 +1114,6 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) ...@@ -1147,8 +1114,6 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
return 0; return 0;
} }
static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type) static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type)
{ {
struct pvc_device *pvc; struct pvc_device *pvc;
...@@ -1174,8 +1139,6 @@ static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type) ...@@ -1174,8 +1139,6 @@ static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type)
return 0; return 0;
} }
static void fr_destroy(struct net_device *frad) static void fr_destroy(struct net_device *frad)
{ {
hdlc_device *hdlc = dev_to_hdlc(frad); hdlc_device *hdlc = dev_to_hdlc(frad);
...@@ -1198,7 +1161,6 @@ static void fr_destroy(struct net_device *frad) ...@@ -1198,7 +1161,6 @@ static void fr_destroy(struct net_device *frad)
} }
} }
static struct hdlc_proto proto = { static struct hdlc_proto proto = {
.close = fr_close, .close = fr_close,
.start = fr_start, .start = fr_start,
...@@ -1209,7 +1171,6 @@ static struct hdlc_proto proto = { ...@@ -1209,7 +1171,6 @@ static struct hdlc_proto proto = {
.module = THIS_MODULE, .module = THIS_MODULE,
}; };
static int fr_ioctl(struct net_device *dev, struct ifreq *ifr) static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
{ {
fr_proto __user *fr_s = ifr->ifr_settings.ifs_ifsu.fr; fr_proto __user *fr_s = ifr->ifr_settings.ifs_ifsu.fr;
...@@ -1309,20 +1270,17 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr) ...@@ -1309,20 +1270,17 @@ static int fr_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