| Message ID | 1548340928-3768-1-git-send-email-albin_yang@163.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2] net: fix coding style | expand |
On Thu, Jan 24, 2019 at 10:42:08PM +0800, Yang Wei wrote: Hi Yang Your subject line needs to be a lot more specific. Maybe something like: net: ipv4: ip_input: Fix blank line coding style issues > Fix coding style, remove redundant blank lines. And this is also not accurate. You actually add a blank line. Andrew > > Signed-off-by: Yang Wei <yang.wei9@zte.com.cn> > --- > net/ipv4/ip_input.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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); > -- > 2.7.4 > >
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 coding style, remove redundant blank lines. Signed-off-by: Yang Wei <yang.wei9@zte.com.cn> --- net/ipv4/ip_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)