提交 82695b30 编写于 作者: S Stephen Hemminger 提交者: David S. Miller

inet: whitespace cleanup

Ran simple script to find/remove trailing whitespace and blank lines
at EOF because that kind of stuff git whines about and editors leave
behind.
Signed-off-by: NStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 262c9740
...@@ -21,4 +21,3 @@ struct ethoc_platform_data { ...@@ -21,4 +21,3 @@ struct ethoc_platform_data {
}; };
#endif /* !LINUX_NET_ETHOC_H */ #endif /* !LINUX_NET_ETHOC_H */
...@@ -125,7 +125,7 @@ static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos, ...@@ -125,7 +125,7 @@ static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos,
fl4->daddr = daddr; fl4->daddr = daddr;
fl4->saddr = saddr; fl4->saddr = saddr;
} }
struct flowi6 { struct flowi6 {
struct flowi_common __fl_common; struct flowi_common __fl_common;
......
...@@ -49,9 +49,9 @@ struct inet_connection_sock_af_ops { ...@@ -49,9 +49,9 @@ struct inet_connection_sock_af_ops {
u16 net_header_len; u16 net_header_len;
u16 net_frag_header_len; u16 net_frag_header_len;
u16 sockaddr_len; u16 sockaddr_len;
int (*setsockopt)(struct sock *sk, int level, int optname, int (*setsockopt)(struct sock *sk, int level, int optname,
char __user *optval, unsigned int optlen); char __user *optval, unsigned int optlen);
int (*getsockopt)(struct sock *sk, int level, int optname, int (*getsockopt)(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen); char __user *optval, int __user *optlen);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
int (*compat_setsockopt)(struct sock *sk, int (*compat_setsockopt)(struct sock *sk,
...@@ -67,7 +67,7 @@ struct inet_connection_sock_af_ops { ...@@ -67,7 +67,7 @@ struct inet_connection_sock_af_ops {
/** inet_connection_sock - INET connection oriented sock /** inet_connection_sock - INET connection oriented sock
* *
* @icsk_accept_queue: FIFO of established children * @icsk_accept_queue: FIFO of established children
* @icsk_bind_hash: Bind node * @icsk_bind_hash: Bind node
* @icsk_timeout: Timeout * @icsk_timeout: Timeout
* @icsk_retransmit_timer: Resend (no ack) * @icsk_retransmit_timer: Resend (no ack)
...@@ -122,7 +122,7 @@ struct inet_connection_sock { ...@@ -122,7 +122,7 @@ struct inet_connection_sock {
unsigned long timeout; /* Currently scheduled timeout */ unsigned long timeout; /* Currently scheduled timeout */
__u32 lrcvtime; /* timestamp of last received data packet */ __u32 lrcvtime; /* timestamp of last received data packet */
__u16 last_seg_size; /* Size of last incoming segment */ __u16 last_seg_size; /* Size of last incoming segment */
__u16 rcv_mss; /* MSS used for delayed ACK decisions */ __u16 rcv_mss; /* MSS used for delayed ACK decisions */
} icsk_ack; } icsk_ack;
struct { struct {
int enabled; int enabled;
...@@ -201,7 +201,7 @@ extern const char inet_csk_timer_bug_msg[]; ...@@ -201,7 +201,7 @@ extern const char inet_csk_timer_bug_msg[];
static inline void inet_csk_clear_xmit_timer(struct sock *sk, const int what) static inline void inet_csk_clear_xmit_timer(struct sock *sk, const int what)
{ {
struct inet_connection_sock *icsk = inet_csk(sk); struct inet_connection_sock *icsk = inet_csk(sk);
if (what == ICSK_TIME_RETRANS || what == ICSK_TIME_PROBE0) { if (what == ICSK_TIME_RETRANS || what == ICSK_TIME_PROBE0) {
icsk->icsk_pending = 0; icsk->icsk_pending = 0;
#ifdef INET_CSK_CLEAR_TIMERS #ifdef INET_CSK_CLEAR_TIMERS
......
...@@ -186,15 +186,15 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len); ...@@ -186,15 +186,15 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
void ip4_datagram_release_cb(struct sock *sk); void ip4_datagram_release_cb(struct sock *sk);
struct ip_reply_arg { struct ip_reply_arg {
struct kvec iov[1]; struct kvec iov[1];
int flags; int flags;
__wsum csum; __wsum csum;
int csumoffset; /* u16 offset of csum in iov[0].iov_base */ int csumoffset; /* u16 offset of csum in iov[0].iov_base */
/* -1 if not needed */ /* -1 if not needed */
int bound_dev_if; int bound_dev_if;
u8 tos; u8 tos;
kuid_t uid; kuid_t uid;
}; };
#define IP_REPLY_ARG_NOSRCCHECK 1 #define IP_REPLY_ARG_NOSRCCHECK 1
...@@ -577,13 +577,13 @@ int ip_frag_mem(struct net *net); ...@@ -577,13 +577,13 @@ int ip_frag_mem(struct net *net);
/* /*
* Functions provided by ip_forward.c * Functions provided by ip_forward.c
*/ */
int ip_forward(struct sk_buff *skb); int ip_forward(struct sk_buff *skb);
/* /*
* Functions provided by ip_options.c * Functions provided by ip_options.c
*/ */
void ip_options_build(struct sk_buff *skb, struct ip_options *opt, void ip_options_build(struct sk_buff *skb, struct ip_options *opt,
__be32 daddr, struct rtable *rt, int is_frag); __be32 daddr, struct rtable *rt, int is_frag);
......
...@@ -157,7 +157,7 @@ struct fib_result_nl { ...@@ -157,7 +157,7 @@ struct fib_result_nl {
unsigned char nh_sel; unsigned char nh_sel;
unsigned char type; unsigned char type;
unsigned char scope; unsigned char scope;
int err; int err;
}; };
#ifdef CONFIG_IP_ROUTE_MULTIPATH #ifdef CONFIG_IP_ROUTE_MULTIPATH
......
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
#define IPV6_ADDR_ANY 0x0000U #define IPV6_ADDR_ANY 0x0000U
#define IPV6_ADDR_UNICAST 0x0001U #define IPV6_ADDR_UNICAST 0x0001U
#define IPV6_ADDR_MULTICAST 0x0002U #define IPV6_ADDR_MULTICAST 0x0002U
#define IPV6_ADDR_LOOPBACK 0x0010U #define IPV6_ADDR_LOOPBACK 0x0010U
#define IPV6_ADDR_LINKLOCAL 0x0020U #define IPV6_ADDR_LINKLOCAL 0x0020U
...@@ -447,7 +447,7 @@ ipv6_masked_addr_cmp(const struct in6_addr *a1, const struct in6_addr *m, ...@@ -447,7 +447,7 @@ ipv6_masked_addr_cmp(const struct in6_addr *a1, const struct in6_addr *m,
#endif #endif
} }
static inline void ipv6_addr_prefix(struct in6_addr *pfx, static inline void ipv6_addr_prefix(struct in6_addr *pfx,
const struct in6_addr *addr, const struct in6_addr *addr,
int plen) int plen)
{ {
...@@ -496,7 +496,7 @@ static inline void __ipv6_addr_set_half(__be32 *addr, ...@@ -496,7 +496,7 @@ static inline void __ipv6_addr_set_half(__be32 *addr,
addr[1] = wl; addr[1] = wl;
} }
static inline void ipv6_addr_set(struct in6_addr *addr, static inline void ipv6_addr_set(struct in6_addr *addr,
__be32 w1, __be32 w2, __be32 w1, __be32 w2,
__be32 w3, __be32 w4) __be32 w3, __be32 w4)
{ {
...@@ -732,7 +732,7 @@ static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int ...@@ -732,7 +732,7 @@ static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int
} }
/* /*
* we should *never* get to this point since that * we should *never* get to this point since that
* would mean the addrs are equal * would mean the addrs are equal
* *
* However, we do get to it 8) And exacly, when * However, we do get to it 8) And exacly, when
......
...@@ -1267,12 +1267,12 @@ static inline void xfrm_sk_free_policy(struct sock *sk) ...@@ -1267,12 +1267,12 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
static inline void xfrm_sk_free_policy(struct sock *sk) {} static inline void xfrm_sk_free_policy(struct sock *sk) {}
static inline int xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk) { return 0; } static inline int xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk) { return 0; }
static inline int xfrm6_route_forward(struct sk_buff *skb) { return 1; } static inline int xfrm6_route_forward(struct sk_buff *skb) { return 1; }
static inline int xfrm4_route_forward(struct sk_buff *skb) { return 1; } static inline int xfrm4_route_forward(struct sk_buff *skb) { return 1; }
static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb) static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
{ {
return 1; return 1;
} }
static inline int xfrm4_policy_check(struct sock *sk, int dir, struct sk_buff *skb) static inline int xfrm4_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
{ {
return 1; return 1;
...@@ -1356,7 +1356,7 @@ __xfrm6_state_addr_check(const struct xfrm_state *x, ...@@ -1356,7 +1356,7 @@ __xfrm6_state_addr_check(const struct xfrm_state *x,
{ {
if (ipv6_addr_equal((struct in6_addr *)daddr, (struct in6_addr *)&x->id.daddr) && if (ipv6_addr_equal((struct in6_addr *)daddr, (struct in6_addr *)&x->id.daddr) &&
(ipv6_addr_equal((struct in6_addr *)saddr, (struct in6_addr *)&x->props.saddr) || (ipv6_addr_equal((struct in6_addr *)saddr, (struct in6_addr *)&x->props.saddr) ||
ipv6_addr_any((struct in6_addr *)saddr) || ipv6_addr_any((struct in6_addr *)saddr) ||
ipv6_addr_any((struct in6_addr *)&x->props.saddr))) ipv6_addr_any((struct in6_addr *)&x->props.saddr)))
return 1; return 1;
return 0; return 0;
...@@ -1666,7 +1666,7 @@ int xfrm_user_policy(struct sock *sk, int optname, ...@@ -1666,7 +1666,7 @@ int xfrm_user_policy(struct sock *sk, int optname,
static inline int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen) static inline int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen)
{ {
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb) static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)
{ {
......
...@@ -171,7 +171,7 @@ static void free_nh_exceptions(struct fib_nh *nh) ...@@ -171,7 +171,7 @@ static void free_nh_exceptions(struct fib_nh *nh)
fnhe = rcu_dereference_protected(hash[i].chain, 1); fnhe = rcu_dereference_protected(hash[i].chain, 1);
while (fnhe) { while (fnhe) {
struct fib_nh_exception *next; struct fib_nh_exception *next;
next = rcu_dereference_protected(fnhe->fnhe_next, 1); next = rcu_dereference_protected(fnhe->fnhe_next, 1);
rt_fibinfo_free(&fnhe->fnhe_rth_input); rt_fibinfo_free(&fnhe->fnhe_rth_input);
......
...@@ -556,4 +556,3 @@ int __init ip_misc_proc_init(void) ...@@ -556,4 +556,3 @@ int __init ip_misc_proc_init(void)
{ {
return register_pernet_subsys(&ip_proc_ops); return register_pernet_subsys(&ip_proc_ops);
} }
...@@ -90,7 +90,7 @@ EXPORT_SYMBOL(xfrm4_tunnel_deregister); ...@@ -90,7 +90,7 @@ EXPORT_SYMBOL(xfrm4_tunnel_deregister);
for (handler = rcu_dereference(head); \ for (handler = rcu_dereference(head); \
handler != NULL; \ handler != NULL; \
handler = rcu_dereference(handler->next)) \ handler = rcu_dereference(handler->next)) \
static int tunnel4_rcv(struct sk_buff *skb) static int tunnel4_rcv(struct sk_buff *skb)
{ {
struct xfrm_tunnel *handler; struct xfrm_tunnel *handler;
......
...@@ -379,4 +379,3 @@ void __init xfrm4_init(void) ...@@ -379,4 +379,3 @@ void __init xfrm4_init(void)
xfrm4_protocol_init(); xfrm4_protocol_init();
register_pernet_subsys(&xfrm4_net_ops); register_pernet_subsys(&xfrm4_net_ops);
} }
...@@ -552,4 +552,3 @@ void ac6_proc_exit(struct net *net) ...@@ -552,4 +552,3 @@ void ac6_proc_exit(struct net *net)
remove_proc_entry("anycast6", net->proc_net); remove_proc_entry("anycast6", net->proc_net);
} }
#endif #endif
...@@ -279,4 +279,3 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset, ...@@ -279,4 +279,3 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
return nexthdr; return nexthdr;
} }
EXPORT_SYMBOL(ipv6_find_hdr); EXPORT_SYMBOL(ipv6_find_hdr);
...@@ -1415,4 +1415,3 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname, ...@@ -1415,4 +1415,3 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,
} }
EXPORT_SYMBOL(compat_ipv6_getsockopt); EXPORT_SYMBOL(compat_ipv6_getsockopt);
#endif #endif
...@@ -355,4 +355,3 @@ void ipv6_misc_proc_exit(void) ...@@ -355,4 +355,3 @@ void ipv6_misc_proc_exit(void)
{ {
unregister_pernet_subsys(&ipv6_proc_ops); unregister_pernet_subsys(&ipv6_proc_ops);
} }
...@@ -196,4 +196,3 @@ void xfrm6_state_fini(void) ...@@ -196,4 +196,3 @@ void xfrm6_state_fini(void)
{ {
xfrm_state_unregister_afinfo(&xfrm6_state_afinfo); xfrm_state_unregister_afinfo(&xfrm6_state_afinfo);
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册