mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 11:20:49 +07:00
net: clean up net/ipv4/ah4.c esp4.c fib_semantics.c inet_connection_sock.c inetpeer.c ip_output.c
Signed-off-by: Jianjun Kong <jianjun@zeuux.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e0db4a786b
commit
d9319100c1
@ -201,8 +201,8 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
|
||||
|
||||
static void ah4_err(struct sk_buff *skb, u32 info)
|
||||
{
|
||||
struct iphdr *iph = (struct iphdr*)skb->data;
|
||||
struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+(iph->ihl<<2));
|
||||
struct iphdr *iph = (struct iphdr *)skb->data;
|
||||
struct ip_auth_hdr *ah = (struct ip_auth_hdr *)(skb->data+(iph->ihl<<2));
|
||||
struct xfrm_state *x;
|
||||
|
||||
if (icmp_hdr(skb)->type != ICMP_DEST_UNREACH ||
|
||||
|
@ -413,8 +413,8 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
|
||||
|
||||
static void esp4_err(struct sk_buff *skb, u32 info)
|
||||
{
|
||||
struct iphdr *iph = (struct iphdr*)skb->data;
|
||||
struct ip_esp_hdr *esph = (struct ip_esp_hdr*)(skb->data+(iph->ihl<<2));
|
||||
struct iphdr *iph = (struct iphdr *)skb->data;
|
||||
struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data+(iph->ihl<<2));
|
||||
struct xfrm_state *x;
|
||||
|
||||
if (icmp_hdr(skb)->type != ICMP_DEST_UNREACH ||
|
||||
|
@ -63,16 +63,16 @@ static DEFINE_SPINLOCK(fib_multipath_lock);
|
||||
for (nhsel=0, nh = (fi)->fib_nh; nhsel < (fi)->fib_nhs; nh++, nhsel++)
|
||||
|
||||
#define change_nexthops(fi) { int nhsel; struct fib_nh * nh; \
|
||||
for (nhsel=0, nh = (struct fib_nh*)((fi)->fib_nh); nhsel < (fi)->fib_nhs; nh++, nhsel++)
|
||||
for (nhsel=0, nh = (struct fib_nh *)((fi)->fib_nh); nhsel < (fi)->fib_nhs; nh++, nhsel++)
|
||||
|
||||
#else /* CONFIG_IP_ROUTE_MULTIPATH */
|
||||
|
||||
/* Hope, that gcc will optimize it to get rid of dummy loop */
|
||||
|
||||
#define for_nexthops(fi) { int nhsel=0; const struct fib_nh * nh = (fi)->fib_nh; \
|
||||
#define for_nexthops(fi) { int nhsel = 0; const struct fib_nh * nh = (fi)->fib_nh; \
|
||||
for (nhsel=0; nhsel < 1; nhsel++)
|
||||
|
||||
#define change_nexthops(fi) { int nhsel=0; struct fib_nh * nh = (struct fib_nh*)((fi)->fib_nh); \
|
||||
#define change_nexthops(fi) { int nhsel = 0; struct fib_nh * nh = (struct fib_nh *)((fi)->fib_nh); \
|
||||
for (nhsel=0; nhsel < 1; nhsel++)
|
||||
|
||||
#endif /* CONFIG_IP_ROUTE_MULTIPATH */
|
||||
@ -358,7 +358,7 @@ int fib_detect_death(struct fib_info *fi, int order,
|
||||
state = n->nud_state;
|
||||
neigh_release(n);
|
||||
}
|
||||
if (state==NUD_REACHABLE)
|
||||
if (state == NUD_REACHABLE)
|
||||
return 0;
|
||||
if ((state&NUD_VALID) && order != dflt)
|
||||
return 0;
|
||||
|
@ -323,7 +323,7 @@ void inet_csk_reset_keepalive_timer(struct sock *sk, unsigned long len)
|
||||
|
||||
EXPORT_SYMBOL(inet_csk_reset_keepalive_timer);
|
||||
|
||||
struct dst_entry* inet_csk_route_req(struct sock *sk,
|
||||
struct dst_entry *inet_csk_route_req(struct sock *sk,
|
||||
const struct request_sock *req)
|
||||
{
|
||||
struct rtable *rt;
|
||||
|
@ -144,7 +144,7 @@ static void unlink_from_unused(struct inet_peer *p)
|
||||
* _stack is known to be NULL or not at compile time,
|
||||
* so compiler will optimize the if (_stack) tests.
|
||||
*/
|
||||
#define lookup(_daddr,_stack) \
|
||||
#define lookup(_daddr, _stack) \
|
||||
({ \
|
||||
struct inet_peer *u, **v; \
|
||||
if (_stack != NULL) { \
|
||||
|
@ -430,7 +430,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
|
||||
* single device frame, and queue such a frame for sending.
|
||||
*/
|
||||
|
||||
int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
|
||||
int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
|
||||
{
|
||||
struct iphdr *iph;
|
||||
int raw = 0;
|
||||
@ -720,7 +720,7 @@ static inline int ip_ufo_append_data(struct sock *sk,
|
||||
int getfrag(void *from, char *to, int offset, int len,
|
||||
int odd, struct sk_buff *skb),
|
||||
void *from, int length, int hh_len, int fragheaderlen,
|
||||
int transhdrlen, int mtu,unsigned int flags)
|
||||
int transhdrlen, int mtu, unsigned int flags)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
int err;
|
||||
@ -741,7 +741,7 @@ static inline int ip_ufo_append_data(struct sock *sk,
|
||||
skb_reserve(skb, hh_len);
|
||||
|
||||
/* create space for UDP/IP header */
|
||||
skb_put(skb,fragheaderlen + transhdrlen);
|
||||
skb_put(skb, fragheaderlen + transhdrlen);
|
||||
|
||||
/* initialize network header pointer */
|
||||
skb_reset_network_header(skb);
|
||||
|
Loading…
Reference in New Issue
Block a user