| Message ID | 1548427310-3553-1-git-send-email-albin_yang@163.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2] net: ipv4: ip_input: fix blank line coding style issues | expand |
On Fri, Jan 25, 2019 at 10:41:50PM +0800, Yang Wei wrote: > Fix blank line coding style issues, make the code cleaner. > Remove a redundant blank line in ip_rcv_core(). > Insert a blank line in ip_rcv() between different statement blocks. > > Signed-off-by: Yang Wei <yang.wei9@zte.com.cn> Hi Yang Thanks, much better. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: Yang Wei <albin_yang@163.com> Date: Fri, 25 Jan 2019 22:41:50 +0800 > Fix blank line coding style issues, make the code cleaner. > Remove a redundant blank line in ip_rcv_core(). > Insert a blank line in ip_rcv() between different statement blocks. > > Signed-off-by: Yang Wei <yang.wei9@zte.com.cn> Applied to net-next.
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 51d8efb..cd6b569 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -429,7 +429,6 @@ static struct sk_buff *ip_rcv_core(struct sk_buff *skb, struct net *net) if (skb->pkt_type == PACKET_OTHERHOST) goto drop; - __IP_UPD_PO_STATS(net, IPSTATS_MIB_IN, skb->len); skb = skb_share_check(skb, GFP_ATOMIC); @@ -521,6 +520,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, skb = ip_rcv_core(skb, net); if (skb == NULL) return NET_RX_DROP; + return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, net, NULL, skb, dev, NULL, ip_rcv_finish);
Fix blank line coding style issues, make the code cleaner. Remove a redundant blank line in ip_rcv_core(). Insert a blank line in ip_rcv() between different statement blocks. Signed-off-by: Yang Wei <yang.wei9@zte.com.cn> --- net/ipv4/ip_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)