korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ipv4: fix checkpatch errors

Browse Source 
Fix checkpatch errors of the following type:
	* ERROR: "foo * bar" should be "foo *bar"
	* ERROR: "(foo*)" should be "(foo *)"

Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Baluta 2012-04-15 01:34:41 +00:00 committed by David S. Miller
parent 586d17c5a0
commit 5e73ea1a31
16 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/af_inet.c
View File

@ -541,7 +541,7 @@ out:
} }
EXPORT_SYMBOL(inet_bind); EXPORT_SYMBOL(inet_bind);
int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr, int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
int addr_len, int flags) int addr_len, int flags)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;

2
net/ipv4/ah4.c
View File

@ -77,7 +77,7 @@ static inline struct scatterlist *ah_req_sg(struct crypto_ahash *ahash,
static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr) static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr)
{ {
unsigned char * optptr = (unsigned char*)(iph+1); unsigned char *optptr = (unsigned char *)(iph+1);
int l = iph->ihl*4 - sizeof(struct iphdr); int l = iph->ihl*4 - sizeof(struct iphdr);
int optlen; int optlen;

16
net/ipv4/igmp.c
View File

@ -344,10 +344,10 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
pip->protocol = IPPROTO_IGMP; pip->protocol = IPPROTO_IGMP;
pip->tot_len = 0; /* filled in later */ pip->tot_len = 0; /* filled in later */
ip_select_ident(pip, &rt->dst, NULL); ip_select_ident(pip, &rt->dst, NULL);
((u8*)&pip[1])[0] = IPOPT_RA; ((u8 *)&pip[1])[0] = IPOPT_RA;
((u8*)&pip[1])[1] = 4; ((u8 *)&pip[1])[1] = 4;
((u8*)&pip[1])[2] = 0; ((u8 *)&pip[1])[2] = 0;
((u8*)&pip[1])[3] = 0; ((u8 *)&pip[1])[3] = 0;
skb->transport_header = skb->network_header + sizeof(struct iphdr) + 4; skb->transport_header = skb->network_header + sizeof(struct iphdr) + 4;
skb_put(skb, sizeof(*pig)); skb_put(skb, sizeof(*pig));
@ -688,10 +688,10 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
iph->saddr = fl4.saddr; iph->saddr = fl4.saddr;
iph->protocol = IPPROTO_IGMP; iph->protocol = IPPROTO_IGMP;
ip_select_ident(iph, &rt->dst, NULL); ip_select_ident(iph, &rt->dst, NULL);
((u8*)&iph[1])[0] = IPOPT_RA; ((u8 *)&iph[1])[0] = IPOPT_RA;
((u8*)&iph[1])[1] = 4; ((u8 *)&iph[1])[1] = 4;
((u8*)&iph[1])[2] = 0; ((u8 *)&iph[1])[2] = 0;
((u8*)&iph[1])[3] = 0; ((u8 *)&iph[1])[3] = 0;
ih = (struct igmphdr *)skb_put(skb, sizeof(struct igmphdr)); ih = (struct igmphdr *)skb_put(skb, sizeof(struct igmphdr));
ih->type = type; ih->type = type;

2
net/ipv4/inet_hashtables.c
View File

@ -217,7 +217,7 @@ begin:
} }
EXPORT_SYMBOL_GPL(__inet_lookup_listener); EXPORT_SYMBOL_GPL(__inet_lookup_listener);
struct sock * __inet_lookup_established(struct net *net, struct sock *__inet_lookup_established(struct net *net,
struct inet_hashinfo *hashinfo, struct inet_hashinfo *hashinfo,
const __be32 saddr, const __be16 sport, const __be32 saddr, const __be16 sport,
const __be32 daddr, const u16 hnum, const __be32 daddr, const u16 hnum,

4
net/ipv4/ip_forward.c
View File

@ -41,7 +41,7 @@
static int ip_forward_finish(struct sk_buff *skb) static int ip_forward_finish(struct sk_buff *skb)
{ {
struct ip_options * opt = &(IPCB(skb)->opt); struct ip_options *opt = &(IPCB(skb)->opt);
IP_INC_STATS_BH(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTFORWDATAGRAMS); IP_INC_STATS_BH(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTFORWDATAGRAMS);
@ -55,7 +55,7 @@ int ip_forward(struct sk_buff *skb)
{ {
struct iphdr *iph; /* Our header */ struct iphdr *iph; /* Our header */
struct rtable *rt; /* Route we use */ struct rtable *rt; /* Route we use */
struct ip_options * opt = &(IPCB(skb)->opt); struct ip_options *opt = &(IPCB(skb)->opt);
if (skb_warn_if_lro(skb)) if (skb_warn_if_lro(skb))
goto drop; goto drop;

20
net/ipv4/ip_gre.c
View File

@ -216,9 +216,9 @@ static struct rtnl_link_stats64 *ipgre_get_stats64(struct net_device *dev,
/* Given src, dst and key, find appropriate for input tunnel. */ /* Given src, dst and key, find appropriate for input tunnel. */
static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev, static struct ip_tunnel *ipgre_tunnel_lookup(struct net_device *dev,
__be32 remote, __be32 local, __be32 remote, __be32 local,
__be32 key, __be16 gre_proto) __be32 key, __be16 gre_proto)
{ {
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
int link = dev->ifindex; int link = dev->ifindex;
@ -483,7 +483,7 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
*/ */
const struct iphdr *iph = (const struct iphdr *)skb->data; const struct iphdr *iph = (const struct iphdr *)skb->data;
__be16 *p = (__be16*)(skb->data+(iph->ihl<<2)); __be16 *p = (__be16 *)(skb->data+(iph->ihl<<2));
int grehlen = (iph->ihl<<2) + 4; int grehlen = (iph->ihl<<2) + 4;
const int type = icmp_hdr(skb)->type; const int type = icmp_hdr(skb)->type;
const int code = icmp_hdr(skb)->code; const int code = icmp_hdr(skb)->code;
@ -593,7 +593,7 @@ static int ipgre_rcv(struct sk_buff *skb)
iph = ip_hdr(skb); iph = ip_hdr(skb);
h = skb->data; h = skb->data;
flags = *(__be16*)h; flags = *(__be16 *)h;
if (flags&(GRE_CSUM|GRE_KEY|GRE_ROUTING|GRE_SEQ|GRE_VERSION)) { if (flags&(GRE_CSUM|GRE_KEY|GRE_ROUTING|GRE_SEQ|GRE_VERSION)) {
/* - Version must be 0. /* - Version must be 0.
@ -617,11 +617,11 @@ static int ipgre_rcv(struct sk_buff *skb)
offset += 4; offset += 4;
} }
if (flags&GRE_KEY) { if (flags&GRE_KEY) {
key = *(__be32*)(h + offset); key = *(__be32 *)(h + offset);
offset += 4; offset += 4;
} }
if (flags&GRE_SEQ) { if (flags&GRE_SEQ) {
seqno = ntohl(*(__be32*)(h + offset)); seqno = ntohl(*(__be32 *)(h + offset));
offset += 4; offset += 4;
} }
} }
@ -921,7 +921,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
htons(ETH_P_TEB) : skb->protocol; htons(ETH_P_TEB) : skb->protocol;
if (tunnel->parms.o_flags&(GRE_KEY|GRE_CSUM|GRE_SEQ)) { if (tunnel->parms.o_flags&(GRE_KEY|GRE_CSUM|GRE_SEQ)) {
__be32 *ptr = (__be32*)(((u8*)iph) + tunnel->hlen - 4); __be32 *ptr = (__be32 *)(((u8 *)iph) + tunnel->hlen - 4);
if (tunnel->parms.o_flags&GRE_SEQ) { if (tunnel->parms.o_flags&GRE_SEQ) {
++tunnel->o_seqno; ++tunnel->o_seqno;
@ -934,7 +934,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
} }
if (tunnel->parms.o_flags&GRE_CSUM) { if (tunnel->parms.o_flags&GRE_CSUM) {
*ptr = 0; *ptr = 0;
*(__sum16*)ptr = ip_compute_csum((void*)(iph+1), skb->len - sizeof(struct iphdr)); *(__sum16 *)ptr = ip_compute_csum((void *)(iph+1), skb->len - sizeof(struct iphdr));
} }
} }
@ -1190,7 +1190,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
{ {
struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel *t = netdev_priv(dev);
struct iphdr *iph = (struct iphdr *)skb_push(skb, t->hlen); struct iphdr *iph = (struct iphdr *)skb_push(skb, t->hlen);
__be16 *p = (__be16*)(iph+1); __be16 *p = (__be16 *)(iph+1);
memcpy(iph, &t->parms.iph, sizeof(struct iphdr)); memcpy(iph, &t->parms.iph, sizeof(struct iphdr));
p[0] = t->parms.o_flags; p[0] = t->parms.o_flags;

24
net/ipv4/ip_options.c
View File

@ -210,10 +210,10 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb)
* Simple and stupid 8), but the most efficient way. * Simple and stupid 8), but the most efficient way.
*/ */
void ip_options_fragment(struct sk_buff * skb) void ip_options_fragment(struct sk_buff *skb)
{ {
unsigned char *optptr = skb_network_header(skb) + sizeof(struct iphdr); unsigned char *optptr = skb_network_header(skb) + sizeof(struct iphdr);
struct ip_options * opt = &(IPCB(skb)->opt); struct ip_options *opt = &(IPCB(skb)->opt);
int l = opt->optlen; int l = opt->optlen;
int optlen; int optlen;
@ -248,13 +248,13 @@ void ip_options_fragment(struct sk_buff * skb)
*/ */
int ip_options_compile(struct net *net, int ip_options_compile(struct net *net,
struct ip_options * opt, struct sk_buff * skb) struct ip_options *opt, struct sk_buff *skb)
{ {
int l; int l;
unsigned char * iph; unsigned char *iph;
unsigned char * optptr; unsigned char *optptr;
int optlen; int optlen;
unsigned char * pp_ptr = NULL; unsigned char *pp_ptr = NULL;
struct rtable *rt = NULL; struct rtable *rt = NULL;
if (skb != NULL) { if (skb != NULL) {
@ -473,20 +473,20 @@ EXPORT_SYMBOL(ip_options_compile);
* Undo all the changes done by ip_options_compile(). * Undo all the changes done by ip_options_compile().
*/ */
void ip_options_undo(struct ip_options * opt) void ip_options_undo(struct ip_options *opt)
{ {
if (opt->srr) { if (opt->srr) {
unsigned char * optptr = opt->__data+opt->srr-sizeof(struct iphdr); unsigned char *optptr = opt->__data+opt->srr-sizeof(struct iphdr);
memmove(optptr+7, optptr+3, optptr[1]-7); memmove(optptr+7, optptr+3, optptr[1]-7);
memcpy(optptr+3, &opt->faddr, 4); memcpy(optptr+3, &opt->faddr, 4);
} }
if (opt->rr_needaddr) { if (opt->rr_needaddr) {
unsigned char * optptr = opt->__data+opt->rr-sizeof(struct iphdr); unsigned char *optptr = opt->__data+opt->rr-sizeof(struct iphdr);
optptr[2] -= 4; optptr[2] -= 4;
memset(&optptr[optptr[2]-1], 0, 4); memset(&optptr[optptr[2]-1], 0, 4);
} }
if (opt->ts) { if (opt->ts) {
unsigned char * optptr = opt->__data+opt->ts-sizeof(struct iphdr); unsigned char *optptr = opt->__data+opt->ts-sizeof(struct iphdr);
if (opt->ts_needtime) { if (opt->ts_needtime) {
optptr[2] -= 4; optptr[2] -= 4;
memset(&optptr[optptr[2]-1], 0, 4); memset(&optptr[optptr[2]-1], 0, 4);
@ -549,8 +549,8 @@ int ip_options_get(struct net *net, struct ip_options_rcu **optp,
void ip_forward_options(struct sk_buff *skb) void ip_forward_options(struct sk_buff *skb)
{ {
struct ip_options * opt = &(IPCB(skb)->opt); struct ip_options *opt = &(IPCB(skb)->opt);
unsigned char * optptr; unsigned char *optptr;
struct rtable *rt = skb_rtable(skb); struct rtable *rt = skb_rtable(skb);
unsigned char *raw = skb_network_header(skb); unsigned char *raw = skb_network_header(skb);

2
net/ipv4/ip_sockglue.c
View File

@ -90,7 +90,7 @@ static void ip_cmsg_recv_opts(struct msghdr *msg, struct sk_buff *skb)
static void ip_cmsg_recv_retopts(struct msghdr *msg, struct sk_buff *skb) static void ip_cmsg_recv_retopts(struct msghdr *msg, struct sk_buff *skb)
{ {
unsigned char optbuf[sizeof(struct ip_options) + 40]; unsigned char optbuf[sizeof(struct ip_options) + 40];
struct ip_options * opt = (struct ip_options *)optbuf; struct ip_options *opt = (struct ip_options *)optbuf;
if (IPCB(skb)->opt.optlen == 0) if (IPCB(skb)->opt.optlen == 0)
return; return;

4
net/ipv4/ipip.c
View File

@ -185,7 +185,7 @@ static struct rtnl_link_stats64 *ipip_get_stats64(struct net_device *dev,
return tot; return tot;
} }
static struct ip_tunnel * ipip_tunnel_lookup(struct net *net, static struct ip_tunnel *ipip_tunnel_lookup(struct net *net,
__be32 remote, __be32 local) __be32 remote, __be32 local)
{ {
unsigned int h0 = HASH(remote); unsigned int h0 = HASH(remote);
@ -260,7 +260,7 @@ static void ipip_tunnel_link(struct ipip_net *ipn, struct ip_tunnel *t)
rcu_assign_pointer(*tp, t); rcu_assign_pointer(*tp, t);
} }
static struct ip_tunnel * ipip_tunnel_locate(struct net *net, static struct ip_tunnel *ipip_tunnel_locate(struct net *net,
struct ip_tunnel_parm *parms, int create) struct ip_tunnel_parm *parms, int create)
{ {
__be32 remote = parms->iph.daddr; __be32 remote = parms->iph.daddr;

2
net/ipv4/ping.c
View File

@ -410,7 +410,7 @@ struct pingfakehdr {
__wsum wcheck; __wsum wcheck;
}; };
static int ping_getfrag(void *from, char * to, static int ping_getfrag(void *from, char *to,
int offset, int fraglen, int odd, struct sk_buff *skb) int offset, int fraglen, int odd, struct sk_buff *skb)
{ {
struct pingfakehdr *pfh = (struct pingfakehdr *)from; struct pingfakehdr *pfh = (struct pingfakehdr *)from;

2
net/ipv4/raw.c
View File

@ -288,7 +288,7 @@ void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info)
read_unlock(&raw_v4_hashinfo.lock); read_unlock(&raw_v4_hashinfo.lock);
} }
static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb) static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
{ {
/* Charge it to the socket. */ /* Charge it to the socket. */

10
net/ipv4/route.c
View File

@ -2215,7 +2215,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
struct in_device *in_dev, struct in_device *in_dev,
__be32 daddr, __be32 saddr, u32 tos) __be32 daddr, __be32 saddr, u32 tos)
{ {
struct rtable* rth = NULL; struct rtable *rth = NULL;
int err; int err;
unsigned hash; unsigned hash;
@ -2257,11 +2257,11 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
struct flowi4 fl4; struct flowi4 fl4;
unsigned flags = 0; unsigned flags = 0;
u32 itag = 0; u32 itag = 0;
struct rtable * rth; struct rtable *rth;
unsigned hash; unsigned hash;
__be32 spec_dst; __be32 spec_dst;
int err = -EINVAL; int err = -EINVAL;
struct net * net = dev_net(dev); struct net *net = dev_net(dev);
/* IP on this device is disabled. */ /* IP on this device is disabled. */
@ -2433,7 +2433,7 @@ martian_source_keep_err:
int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr, int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
u8 tos, struct net_device *dev, bool noref) u8 tos, struct net_device *dev, bool noref)
{ {
struct rtable * rth; struct rtable *rth;
unsigned hash; unsigned hash;
int iif = dev->ifindex; int iif = dev->ifindex;
struct net *net; struct net *net;
@ -3068,7 +3068,7 @@ nla_put_failure:
return -EMSGSIZE; return -EMSGSIZE;
} }
static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg) static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void *arg)
{ {
struct net *net = sock_net(in_skb->sk); struct net *net = sock_net(in_skb->sk);
struct rtmsg *rtm; struct rtmsg *rtm;

2
net/ipv4/tcp_probe.c
View File

@ -138,7 +138,7 @@ static struct jprobe tcp_jprobe = {
.entry = jtcp_rcv_established, .entry = jtcp_rcv_established,
}; };
static int tcpprobe_open(struct inode * inode, struct file * file) static int tcpprobe_open(struct inode *inode, struct file *file)
{ {
/* Reset (empty) log */ /* Reset (empty) log */
spin_lock_bh(&tcp_probe.lock); spin_lock_bh(&tcp_probe.lock);

2
net/ipv4/udp.c
View File

@ -847,7 +847,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
* Get and verify the address. * Get and verify the address.
*/ */
if (msg->msg_name) { if (msg->msg_name) {
struct sockaddr_in * usin = (struct sockaddr_in *)msg->msg_name; struct sockaddr_in *usin = (struct sockaddr_in *)msg->msg_name;
if (msg->msg_namelen < sizeof(*usin)) if (msg->msg_namelen < sizeof(*usin))
return -EINVAL; return -EINVAL;
if (usin->sin_family != AF_INET) { if (usin->sin_family != AF_INET) {

2
net/ipv4/udp_impl.h
View File

@ -25,7 +25,7 @@ extern int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
size_t len, int noblock, int flags, int *addr_len); size_t len, int noblock, int flags, int *addr_len);
extern int udp_sendpage(struct sock *sk, struct page *page, int offset, extern int udp_sendpage(struct sock *sk, struct page *page, int offset,
size_t size, int flags); size_t size, int flags);
extern int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb); extern int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
extern void udp_destroy_sock(struct sock *sk); extern void udp_destroy_sock(struct sock *sk);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS

2
net/ipv4/xfrm4_policy.c
View File

@ -152,7 +152,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
case IPPROTO_AH: case IPPROTO_AH:
if (pskb_may_pull(skb, xprth + 8 - skb->data)) { if (pskb_may_pull(skb, xprth + 8 - skb->data)) {
__be32 *ah_hdr = (__be32*)xprth; __be32 *ah_hdr = (__be32 *)xprth;
fl4->fl4_ipsec_spi = ah_hdr[1]; fl4->fl4_ipsec_spi = ah_hdr[1];
} }