Skip to content

Commit 870b856

Browse files
pseidererkuba-moo
authored andcommitted
net: pktgen: fix code style (WARNING: Block comments)
Fix checkpatch code style warnings: WARNING: Block comments use a trailing */ on a separate line + * removal by worker thread */ WARNING: Block comments use * on subsequent lines + __u8 tos; /* six MSB of (former) IPv4 TOS + are for dscp codepoint */ WARNING: Block comments use a trailing */ on a separate line + are for dscp codepoint */ WARNING: Block comments use * on subsequent lines + __u8 traffic_class; /* ditto for the (former) Traffic Class in IPv6 + (see RFC 3260, sec. 4) */ WARNING: Block comments use a trailing */ on a separate line + (see RFC 3260, sec. 4) */ WARNING: Block comments use * on subsequent lines + /* = { + 0x00, 0x80, 0xC8, 0x79, 0xB3, 0xCB, WARNING: Block comments use * on subsequent lines + /* Field for thread to receive "posted" events terminate, + stop ifs etc. */ WARNING: Block comments use a trailing */ on a separate line + stop ifs etc. */ WARNING: Block comments should align the * on each line + * we go look for it ... +*/ WARNING: Block comments use a trailing */ on a separate line + * we resolve the dst issue */ WARNING: Block comments use a trailing */ on a separate line + * with proc_create_data() */ Signed-off-by: Peter Seiderer <[email protected]> Reviewed-by: Toke Høiland-Jørgensen <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1d8f07b commit 870b856

File tree

1 file changed

+23
-16
lines changed

1 file changed

+23
-16
lines changed

net/core/pktgen.c

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ struct pktgen_dev {
283283
int pkt_overhead; /* overhead for MPLS, VLANs, IPSEC etc */
284284
int nfrags;
285285
int removal_mark; /* non-zero => the device is marked for
286-
* removal by worker thread */
286+
* removal by worker thread
287+
*/
287288

288289
struct page *page;
289290
u64 delay; /* nano-seconds */
@@ -346,10 +347,12 @@ struct pktgen_dev {
346347
__u16 udp_dst_max; /* exclusive, dest UDP port */
347348

348349
/* DSCP + ECN */
349-
__u8 tos; /* six MSB of (former) IPv4 TOS
350-
are for dscp codepoint */
351-
__u8 traffic_class; /* ditto for the (former) Traffic Class in IPv6
352-
(see RFC 3260, sec. 4) */
350+
__u8 tos; /* six MSB of (former) IPv4 TOS
351+
* are for dscp codepoint
352+
*/
353+
__u8 traffic_class; /* ditto for the (former) Traffic Class in IPv6
354+
* (see RFC 3260, sec. 4)
355+
*/
353356

354357
/* IMIX */
355358
unsigned int n_imix_entries;
@@ -389,12 +392,12 @@ struct pktgen_dev {
389392

390393
__u8 hh[14];
391394
/* = {
392-
0x00, 0x80, 0xC8, 0x79, 0xB3, 0xCB,
393-
394-
We fill in SRC address later
395-
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
396-
0x08, 0x00
397-
};
395+
* 0x00, 0x80, 0xC8, 0x79, 0xB3, 0xCB,
396+
*
397+
* We fill in SRC address later
398+
* 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
399+
* 0x08, 0x00
400+
* };
398401
*/
399402
__u16 pad; /* pad out the hh struct to an even 16 bytes */
400403

@@ -458,7 +461,8 @@ struct pktgen_thread {
458461
char result[512];
459462

460463
/* Field for thread to receive "posted" events terminate,
461-
stop ifs etc. */
464+
* stop ifs etc.
465+
*/
462466

463467
u32 control;
464468
int cpu;
@@ -2397,7 +2401,7 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)
23972401

23982402
/* If there was already an IPSEC SA, we keep it as is, else
23992403
* we go look for it ...
2400-
*/
2404+
*/
24012405
#define DUMMY_MARK 0
24022406
static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
24032407
{
@@ -2694,7 +2698,8 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev)
26942698
if (!x)
26952699
return 0;
26962700
/* XXX: we dont support tunnel mode for now until
2697-
* we resolve the dst issue */
2701+
* we resolve the dst issue
2702+
*/
26982703
if ((x->props.mode != XFRM_MODE_TRANSPORT) && (pkt_dev->spi == 0))
26992704
return 0;
27002705

@@ -3788,7 +3793,8 @@ static int add_dev_to_thread(struct pktgen_thread *t,
37883793
* userspace on another CPU than the kthread. The if_lock()
37893794
* is used here to sync with concurrent instances of
37903795
* _rem_dev_from_if_list() invoked via kthread, which is also
3791-
* updating the if_list */
3796+
* updating the if_list
3797+
*/
37923798
if_lock(t);
37933799

37943800
if (pkt_dev->pg_thread) {
@@ -3983,7 +3989,8 @@ static int pktgen_remove_device(struct pktgen_thread *t,
39833989

39843990
/* Remove proc before if_list entry, because add_device uses
39853991
* list to determine if interface already exist, avoid race
3986-
* with proc_create_data() */
3992+
* with proc_create_data()
3993+
*/
39873994
proc_remove(pkt_dev->entry);
39883995

39893996
/* And update the thread if_list */

0 commit comments

Comments
 (0)