forked from luck/tmp_suning_uos_patched
net: clean up codestyle
This is a pure codestyle cleanup patch. No functional change intended. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cbc08a3312
commit
5af68891dc
|
@ -214,7 +214,7 @@ dst_allfrag(const struct dst_entry *dst)
|
|||
static inline int
|
||||
dst_metric_locked(const struct dst_entry *dst, int metric)
|
||||
{
|
||||
return dst_metric(dst, RTAX_LOCK) & (1<<metric);
|
||||
return dst_metric(dst, RTAX_LOCK) & (1 << metric);
|
||||
}
|
||||
|
||||
static inline void dst_hold(struct dst_entry *dst)
|
||||
|
|
|
@ -1478,7 +1478,7 @@ sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)
|
|||
{
|
||||
if (!sk_has_account(sk))
|
||||
return true;
|
||||
return size<= sk->sk_forward_alloc ||
|
||||
return size <= sk->sk_forward_alloc ||
|
||||
__sk_mem_schedule(sk, size, SK_MEM_RECV) ||
|
||||
skb_pfmemalloc(skb);
|
||||
}
|
||||
|
|
|
@ -784,7 +784,7 @@ EXPORT_SYMBOL(icmp_ndo_send);
|
|||
|
||||
static void icmp_socket_deliver(struct sk_buff *skb, u32 info)
|
||||
{
|
||||
const struct iphdr *iph = (const struct iphdr *) skb->data;
|
||||
const struct iphdr *iph = (const struct iphdr *)skb->data;
|
||||
const struct net_protocol *ipprot;
|
||||
int protocol = iph->protocol;
|
||||
|
||||
|
|
|
@ -1536,7 +1536,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
|
|||
ip_select_ident(net, skb, sk);
|
||||
|
||||
if (opt) {
|
||||
iph->ihl += opt->optlen>>2;
|
||||
iph->ihl += opt->optlen >> 2;
|
||||
ip_options_build(skb, opt, cork->addr, rt, 0);
|
||||
}
|
||||
|
||||
|
|
|
@ -293,7 +293,8 @@ EXPORT_SYMBOL_GPL(ping_close);
|
|||
|
||||
/* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */
|
||||
static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
|
||||
struct sockaddr *uaddr, int addr_len) {
|
||||
struct sockaddr *uaddr, int addr_len)
|
||||
{
|
||||
struct net *net = sock_net(sk);
|
||||
if (sk->sk_family == AF_INET) {
|
||||
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
|
||||
|
@ -634,7 +635,8 @@ static int ping_v4_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh,
|
|||
}
|
||||
|
||||
int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
|
||||
void *user_icmph, size_t icmph_len) {
|
||||
void *user_icmph, size_t icmph_len)
|
||||
{
|
||||
u8 type, code;
|
||||
|
||||
if (len > 0xFFFF)
|
||||
|
|
|
@ -623,7 +623,7 @@ static inline u32 fnhe_hashfun(__be32 daddr)
|
|||
u32 hval;
|
||||
|
||||
net_get_random_once(&fnhe_hashrnd, sizeof(fnhe_hashrnd));
|
||||
hval = jhash_1word((__force u32) daddr, fnhe_hashrnd);
|
||||
hval = jhash_1word((__force u32)daddr, fnhe_hashrnd);
|
||||
return hash_32(hval, FNHE_HASH_SHIFT);
|
||||
}
|
||||
|
||||
|
@ -1062,7 +1062,7 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
|
|||
void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
|
||||
int oif, u8 protocol)
|
||||
{
|
||||
const struct iphdr *iph = (const struct iphdr *) skb->data;
|
||||
const struct iphdr *iph = (const struct iphdr *)skb->data;
|
||||
struct flowi4 fl4;
|
||||
struct rtable *rt;
|
||||
u32 mark = IP4_REPLY_MARK(net, skb->mark);
|
||||
|
@ -1097,7 +1097,7 @@ static void __ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)
|
|||
|
||||
void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)
|
||||
{
|
||||
const struct iphdr *iph = (const struct iphdr *) skb->data;
|
||||
const struct iphdr *iph = (const struct iphdr *)skb->data;
|
||||
struct flowi4 fl4;
|
||||
struct rtable *rt;
|
||||
struct dst_entry *odst = NULL;
|
||||
|
@ -1152,7 +1152,7 @@ EXPORT_SYMBOL_GPL(ipv4_sk_update_pmtu);
|
|||
void ipv4_redirect(struct sk_buff *skb, struct net *net,
|
||||
int oif, u8 protocol)
|
||||
{
|
||||
const struct iphdr *iph = (const struct iphdr *) skb->data;
|
||||
const struct iphdr *iph = (const struct iphdr *)skb->data;
|
||||
struct flowi4 fl4;
|
||||
struct rtable *rt;
|
||||
|
||||
|
@ -1308,7 +1308,7 @@ static unsigned int ipv4_default_advmss(const struct dst_entry *dst)
|
|||
|
||||
static unsigned int ipv4_mtu(const struct dst_entry *dst)
|
||||
{
|
||||
const struct rtable *rt = (const struct rtable *) dst;
|
||||
const struct rtable *rt = (const struct rtable *)dst;
|
||||
unsigned int mtu = rt->rt_pmtu;
|
||||
|
||||
if (!mtu || time_after_eq(jiffies, rt->dst.expires))
|
||||
|
|
Loading…
Reference in New Issue
Block a user