net: delete "register" keyword
Subsystems (4)
PATCH 1/1 net: delete "register" keyword
Delete long obsoleted "register" keyword.
Signed-off-by Alexey Dobriyan <[email protected]>
---
drivers/net/ethernet/apple/bmac.c | 4 ++-- drivers/net/slip/slhc.c | 30 +++++++++++++++--------------- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- net/netfilter/ipvs/ip_vs_lblcr.c | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-)
drivers/net/ethernet/apple/bmac.c +2 -2
@@ -815,8 +815,8 @@ static int reverse6[64] = {static unsigned int crc416 (unsigned int curval,unsigned short nxtval) { - registerunsigned int counter, cur = curval, next = nxtval; - registerint high_crc_set, low_data_set; +unsigned int counter, cur = curval, next = nxtval; +int high_crc_set, low_data_set;/* Swap bytes */ next = ((next &0x00FF ) <<8 ) | (next >>8 );
drivers/net/slip/slhc.c +15 -15
@@ -91,8 +91,8 @@ static unsigned short pull16(unsigned char **cpp);struct slcompress *slhc_init (int rslots,int tslots) { - registershort i; - registerstruct cstate *ts; +short i; +struct cstate *ts;struct slcompress *comp;if (rslots <0 || rslots >255 || tslots <0 || tslots >255 )
@@ -206,7 +206,7 @@ pull16(unsigned char **cpp)static long decode (unsigned char **cpp) { - registerint x; +int x; x = *(*cpp)++;if (x ==0 ){
@@ -227,14 +227,14 @@ int slhc_compress(struct slcompress *comp, unsigned char *icp, int isize, unsigned char *ocp, unsigned char **cpp, int compress_cid) { - register struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]); - registerstruct cstate *lcs = ocs; - registerstruct cstate *cs = lcs->next; - registerunsigned long deltaS, deltaA; - registershort changes =0 ; + struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]); +struct cstate *lcs = ocs; +struct cstate *cs = lcs->next; +unsigned long deltaS, deltaA; +short changes =0 ;int hlen;unsigned char new_seq[16 ]; - registerunsigned char *cp = new_seq; +unsigned char *cp = new_seq;struct iphdr *ip;struct tcphdr *th, *oth;__sum16 csum;
@@ -486,11 +486,11 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,int slhc_uncompress (struct slcompress *comp,unsigned char *icp,int isize) { - registerint changes; +int changes;long x; - registerstruct tcphdr *thp; - registerstruct iphdr *ip; - registerstruct cstate *cs; +struct tcphdr *thp; +struct iphdr *ip; +struct cstate *cs;int len, hdrlen;unsigned char *cp = icp;
@@ -543,7 +543,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)switch (changes &SPECIALS_MASK ){case SPECIAL_I :/* Echoed terminal traffic */ { - registershort i; +short i; i =ntohs (ip->tot_len) - hdrlen; thp->ack_seq =htonl (ntohl (thp->ack_seq) + i); thp->seq =htonl (ntohl (thp->seq) + i);
@@ -637,7 +637,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)int slhc_remember (struct slcompress *comp,unsigned char *icp,int isize) { - registerstruct cstate *cs; +struct cstate *cs;unsigned ihl;unsigned char index;
net/netfilter/ipvs/ip_vs_ctl.c +2 -2
@@ -262,7 +262,7 @@ static inline unsigned int ip_vs_svc_hashkey(struct netns_ipvs *ipvs, int af, unsigned int proto, const union nf_inet_addr *addr, __be16 port) { - register unsigned int porth = ntohs(port); + unsigned int porth = ntohs(port);__be32 addr_fold = addr->ip;__u32 ahash;
@@ -493,7 +493,7 @@ static inline unsigned int ip_vs_rs_hashkey(int af,const union nf_inet_addr *addr, __be16 port) { - registerunsigned int porth =ntohs (port); + unsigned int porth = ntohs(port);__be32 addr_fold = addr->ip;#ifdef CONFIG_IP_VS_IPV6
net/netfilter/ipvs/ip_vs_lblcr.c +2 -2
@@ -160,7 +160,7 @@ static void ip_vs_dest_set_eraseall(struct ip_vs_dest_set *set)/* get weighted least-connection node in the destination set */ static inline struct ip_vs_dest *ip_vs_dest_set_min (struct ip_vs_dest_set *set) { - registerstruct ip_vs_dest_set_elem *e; +struct ip_vs_dest_set_elem *e;struct ip_vs_dest *dest, *least;int loh, doh;
@@ -209,7 +209,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)/* get weighted most-connection node in the destination set */ static inline struct ip_vs_dest *ip_vs_dest_set_max (struct ip_vs_dest_set *set) { - registerstruct ip_vs_dest_set_elem *e; +struct ip_vs_dest_set_elem *e;struct ip_vs_dest *dest, *most;int moh, doh;
From: Alexey Dobriyan <[email protected]>
Date: Mon, 5 Aug 2019 23:34:41 +0300
Quoted 3 lines
Delete long obsoleted "register" keyword.
Signed-off-by Alexey Dobriyan <[email protected]>
Applied.
Quoted 10 lines · Alexey Dobriyan
Delete long obsoleted "register" keyword.
Signed-off-by Alexey Dobriyan <[email protected]>---
drivers/net/ethernet/apple/bmac.c | 4 ++-- drivers/net/slip/slhc.c | 30 +++++++++++++++--------------- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- net/netfilter/ipvs/ip_vs_lblcr.c | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-)
IPVS portion:
Reviewed-by Simon Horman <[email protected]>
Quoted 132 lines
drivers/net/ethernet/apple/bmac.c +2
-2@@ -815,8 +815,8 @@ static int reverse6[64] = {static unsigned int crc416 (unsigned int curval,unsigned short nxtval) { - registerunsigned int counter, cur = curval, next = nxtval; - registerint high_crc_set, low_data_set; +unsigned int counter, cur = curval, next = nxtval; +int high_crc_set, low_data_set;/* Swap bytes */ next = ((next &0x00FF ) <<8 ) | (next >>8 );drivers/net/slip/slhc.c +15
-15@@ -91,8 +91,8 @@ static unsigned short pull16(unsigned char **cpp);struct slcompress *slhc_init (int rslots,int tslots) { - registershort i; - registerstruct cstate *ts; +short i; +struct cstate *ts;struct slcompress *comp;if (rslots <0 || rslots >255 || tslots <0 || tslots >255 )@@ -206,7 +206,7 @@ pull16(unsigned char **cpp)static long decode (unsigned char **cpp) { - registerint x; +int x; x = *(*cpp)++;if (x ==0 ){@@ -227,14 +227,14 @@ int slhc_compress(struct slcompress *comp, unsigned char *icp, int isize, unsigned char *ocp, unsigned char **cpp, int compress_cid) { - register struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]); - registerstruct cstate *lcs = ocs; - registerstruct cstate *cs = lcs->next; - registerunsigned long deltaS, deltaA; - registershort changes =0 ; + struct cstate *ocs = &(comp->tstate[comp->xmit_oldest]); +struct cstate *lcs = ocs; +struct cstate *cs = lcs->next; +unsigned long deltaS, deltaA; +short changes =0 ;int hlen;unsigned char new_seq[16 ]; - registerunsigned char *cp = new_seq; +unsigned char *cp = new_seq;struct iphdr *ip;struct tcphdr *th, *oth;__sum16 csum;@@ -486,11 +486,11 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,int slhc_uncompress (struct slcompress *comp,unsigned char *icp,int isize) { - registerint changes; +int changes;long x; - registerstruct tcphdr *thp; - registerstruct iphdr *ip; - registerstruct cstate *cs; +struct tcphdr *thp; +struct iphdr *ip; +struct cstate *cs;int len, hdrlen;unsigned char *cp = icp;@@ -543,7 +543,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)switch (changes &SPECIALS_MASK ){case SPECIAL_I :/* Echoed terminal traffic */ { - registershort i; +short i; i =ntohs (ip->tot_len) - hdrlen; thp->ack_seq =htonl (ntohl (thp->ack_seq) + i); thp->seq =htonl (ntohl (thp->seq) + i);@@ -637,7 +637,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)int slhc_remember (struct slcompress *comp,unsigned char *icp,int isize) { - registerstruct cstate *cs; +struct cstate *cs;unsigned ihl;unsigned char index;net/netfilter/ipvs/ip_vs_ctl.c +2
-2@@ -262,7 +262,7 @@ static inline unsigned int ip_vs_svc_hashkey(struct netns_ipvs *ipvs, int af, unsigned int proto, const union nf_inet_addr *addr, __be16 port) { - register unsigned int porth = ntohs(port); + unsigned int porth = ntohs(port);__be32 addr_fold = addr->ip;__u32 ahash;@@ -493,7 +493,7 @@ static inline unsigned int ip_vs_rs_hashkey(int af,const union nf_inet_addr *addr, __be16 port) { - registerunsigned int porth =ntohs (port); + unsigned int porth = ntohs(port);__be32 addr_fold = addr->ip;#ifdef CONFIG_IP_VS_IPV6 net/netfilter/ipvs/ip_vs_lblcr.c +2
-2@@ -160,7 +160,7 @@ static void ip_vs_dest_set_eraseall(struct ip_vs_dest_set *set)/* get weighted least-connection node in the destination set */ static inline struct ip_vs_dest *ip_vs_dest_set_min (struct ip_vs_dest_set *set) { - registerstruct ip_vs_dest_set_elem *e; +struct ip_vs_dest_set_elem *e;struct ip_vs_dest *dest, *least;int loh, doh;@@ -209,7 +209,7 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)/* get weighted most-connection node in the destination set */ static inline struct ip_vs_dest *ip_vs_dest_set_max (struct ip_vs_dest_set *set) { - registerstruct ip_vs_dest_set_elem *e; +struct ip_vs_dest_set_elem *e;struct ip_vs_dest *dest, *most;int moh, doh;