Skip to content

Commit cf536c0

Browse files
pseidererNipaLocal
pseiderer
authored and
NipaLocal
committed
net: pktgen: fix code style (WARNING: Missing a blank line after declarations)
Fix checkpatch code style warnings: WARNING: Missing a blank line after declarations kernel-patches#761: FILE: net/core/pktgen.c:761: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#780: FILE: net/core/pktgen.c:780: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#806: FILE: net/core/pktgen.c:806: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#823: FILE: net/core/pktgen.c:823: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#1968: FILE: net/core/pktgen.c:1968: + char f[32]; + memset(f, 0, 32); WARNING: Missing a blank line after declarations kernel-patches#2410: FILE: net/core/pktgen.c:2410: + struct pktgen_net *pn = net_generic(dev_net(pkt_dev->odev), pg_net_id); + if (!x) { WARNING: Missing a blank line after declarations kernel-patches#2442: FILE: net/core/pktgen.c:2442: + __u16 t; + if (pkt_dev->flags & F_QUEUE_MAP_RND) { WARNING: Missing a blank line after declarations kernel-patches#2523: FILE: net/core/pktgen.c:2523: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations kernel-patches#2567: FILE: net/core/pktgen.c:2567: + __u32 t; + if (pkt_dev->flags & F_IPSRC_RND) WARNING: Missing a blank line after declarations kernel-patches#2587: FILE: net/core/pktgen.c:2587: + __be32 s; + if (pkt_dev->flags & F_IPDST_RND) { WARNING: Missing a blank line after declarations kernel-patches#2634: FILE: net/core/pktgen.c:2634: + __u32 t; + if (pkt_dev->flags & F_TXSIZE_RND) { WARNING: Missing a blank line after declarations kernel-patches#2736: FILE: net/core/pktgen.c:2736: + int i; + for (i = 0; i < pkt_dev->cflows; i++) { WARNING: Missing a blank line after declarations kernel-patches#2738: FILE: net/core/pktgen.c:2738: + struct xfrm_state *x = pkt_dev->flows[i].x; + if (x) { WARNING: Missing a blank line after declarations kernel-patches#2752: FILE: net/core/pktgen.c:2752: + int nhead = 0; + if (x) { WARNING: Missing a blank line after declarations kernel-patches#2795: FILE: net/core/pktgen.c:2795: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations kernel-patches#3480: FILE: net/core/pktgen.c:3480: + ktime_t idle_start = ktime_get(); + schedule(); Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: NipaLocal <nipa@local>
1 parent d8e62da commit cf536c0

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

‎net/core/pktgen.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,7 @@ static ssize_t hex32_arg(const char __user *user_buffer, size_t maxlen,
758758
for (; i < maxlen; i++) {
759759
int value;
760760
char c;
761+
761762
if (get_user(c, &user_buffer[i]))
762763
return -EFAULT;
763764
value = hex_to_bin(c);
@@ -777,6 +778,7 @@ static ssize_t count_trail_chars(const char __user *user_buffer, size_t maxlen)
777778

778779
for (i = 0; i < maxlen; i++) {
779780
char c;
781+
780782
if (get_user(c, &user_buffer[i]))
781783
return -EFAULT;
782784
switch (c) {
@@ -803,6 +805,7 @@ static ssize_t num_arg(const char __user *user_buffer, size_t maxlen,
803805

804806
for (i = 0; i < maxlen; i++) {
805807
char c;
808+
806809
if (get_user(c, &user_buffer[i]))
807810
return -EFAULT;
808811
if ((c >= '0') && (c <= '9')) {
@@ -820,6 +823,7 @@ static ssize_t strn_len(const char __user *user_buffer, size_t maxlen)
820823

821824
for (i = 0; i < maxlen; i++) {
822825
char c;
826+
823827
if (get_user(c, &user_buffer[i]))
824828
return -EFAULT;
825829
switch (c) {
@@ -1965,6 +1969,7 @@ static ssize_t pktgen_thread_write(struct file *file,
19651969

19661970
if (!strcmp(name, "add_device")) {
19671971
char f[32];
1972+
19681973
memset(f, 0, 32);
19691974
max = min(sizeof(f) - 1, count - i);
19701975
len = strn_len(&user_buffer[i], max);
@@ -2407,6 +2412,7 @@ static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
24072412
#ifdef CONFIG_XFRM
24082413
struct xfrm_state *x = pkt_dev->flows[flow].x;
24092414
struct pktgen_net *pn = net_generic(dev_net(pkt_dev->odev), pg_net_id);
2415+
24102416
if (!x) {
24112417

24122418
if (pkt_dev->spi) {
@@ -2439,6 +2445,7 @@ static void set_cur_queue_map(struct pktgen_dev *pkt_dev)
24392445

24402446
else if (pkt_dev->queue_map_min <= pkt_dev->queue_map_max) {
24412447
__u16 t;
2448+
24422449
if (pkt_dev->flags & F_QUEUE_MAP_RND) {
24432450
t = get_random_u32_inclusive(pkt_dev->queue_map_min,
24442451
pkt_dev->queue_map_max);
@@ -2520,6 +2527,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
25202527

25212528
if (pkt_dev->flags & F_MPLS_RND) {
25222529
unsigned int i;
2530+
25232531
for (i = 0; i < pkt_dev->nr_labels; i++)
25242532
if (pkt_dev->labels[i] & MPLS_STACK_BOTTOM)
25252533
pkt_dev->labels[i] = MPLS_STACK_BOTTOM |
@@ -2564,6 +2572,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
25642572
imx = ntohl(pkt_dev->saddr_max);
25652573
if (imn < imx) {
25662574
__u32 t;
2575+
25672576
if (pkt_dev->flags & F_IPSRC_RND)
25682577
t = get_random_u32_inclusive(imn, imx - 1);
25692578
else {
@@ -2584,6 +2593,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
25842593
if (imn < imx) {
25852594
__u32 t;
25862595
__be32 s;
2596+
25872597
if (pkt_dev->flags & F_IPDST_RND) {
25882598

25892599
do {
@@ -2631,6 +2641,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
26312641

26322642
if (pkt_dev->min_pkt_size < pkt_dev->max_pkt_size) {
26332643
__u32 t;
2644+
26342645
if (pkt_dev->flags & F_TXSIZE_RND) {
26352646
t = get_random_u32_inclusive(pkt_dev->min_pkt_size,
26362647
pkt_dev->max_pkt_size - 1);
@@ -2733,8 +2744,10 @@ static void free_SAs(struct pktgen_dev *pkt_dev)
27332744
if (pkt_dev->cflows) {
27342745
/* let go of the SAs if we have them */
27352746
int i;
2747+
27362748
for (i = 0; i < pkt_dev->cflows; i++) {
27372749
struct xfrm_state *x = pkt_dev->flows[i].x;
2750+
27382751
if (x) {
27392752
xfrm_state_put(x);
27402753
pkt_dev->flows[i].x = NULL;
@@ -2749,6 +2762,7 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
27492762
if (pkt_dev->flags & F_IPSEC) {
27502763
struct xfrm_state *x = pkt_dev->flows[pkt_dev->curfl].x;
27512764
int nhead = 0;
2765+
27522766
if (x) {
27532767
struct ethhdr *eth;
27542768
struct iphdr *iph;
@@ -2792,6 +2806,7 @@ static int process_ipsec(struct pktgen_dev *pkt_dev,
27922806
static void mpls_push(__be32 *mpls, struct pktgen_dev *pkt_dev)
27932807
{
27942808
unsigned int i;
2809+
27952810
for (i = 0; i < pkt_dev->nr_labels; i++)
27962811
*mpls++ = pkt_dev->labels[i] & ~MPLS_STACK_BOTTOM;
27972812

@@ -3477,6 +3492,7 @@ static void pktgen_rem_thread(struct pktgen_thread *t)
34773492
static void pktgen_resched(struct pktgen_dev *pkt_dev)
34783493
{
34793494
ktime_t idle_start = ktime_get();
3495+
34803496
schedule();
34813497
pkt_dev->idle_acc += ktime_to_ns(ktime_sub(ktime_get(), idle_start));
34823498
}

0 commit comments

Comments
 (0)