mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-13 14:09:38 -04:00
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 <ps.report@gmx.net>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
1d8f07bf4a
commit
870b856cb4
@@ -283,7 +283,8 @@ struct pktgen_dev {
|
||||
int pkt_overhead; /* overhead for MPLS, VLANs, IPSEC etc */
|
||||
int nfrags;
|
||||
int removal_mark; /* non-zero => the device is marked for
|
||||
* removal by worker thread */
|
||||
* removal by worker thread
|
||||
*/
|
||||
|
||||
struct page *page;
|
||||
u64 delay; /* nano-seconds */
|
||||
@@ -346,10 +347,12 @@ struct pktgen_dev {
|
||||
__u16 udp_dst_max; /* exclusive, dest UDP port */
|
||||
|
||||
/* DSCP + ECN */
|
||||
__u8 tos; /* six MSB of (former) IPv4 TOS
|
||||
are for dscp codepoint */
|
||||
__u8 traffic_class; /* ditto for the (former) Traffic Class in IPv6
|
||||
(see RFC 3260, sec. 4) */
|
||||
__u8 tos; /* six MSB of (former) IPv4 TOS
|
||||
* are for dscp codepoint
|
||||
*/
|
||||
__u8 traffic_class; /* ditto for the (former) Traffic Class in IPv6
|
||||
* (see RFC 3260, sec. 4)
|
||||
*/
|
||||
|
||||
/* IMIX */
|
||||
unsigned int n_imix_entries;
|
||||
@@ -389,12 +392,12 @@ struct pktgen_dev {
|
||||
|
||||
__u8 hh[14];
|
||||
/* = {
|
||||
0x00, 0x80, 0xC8, 0x79, 0xB3, 0xCB,
|
||||
|
||||
We fill in SRC address later
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x08, 0x00
|
||||
};
|
||||
* 0x00, 0x80, 0xC8, 0x79, 0xB3, 0xCB,
|
||||
*
|
||||
* We fill in SRC address later
|
||||
* 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
* 0x08, 0x00
|
||||
* };
|
||||
*/
|
||||
__u16 pad; /* pad out the hh struct to an even 16 bytes */
|
||||
|
||||
@@ -458,7 +461,8 @@ struct pktgen_thread {
|
||||
char result[512];
|
||||
|
||||
/* Field for thread to receive "posted" events terminate,
|
||||
stop ifs etc. */
|
||||
* stop ifs etc.
|
||||
*/
|
||||
|
||||
u32 control;
|
||||
int cpu;
|
||||
@@ -2397,7 +2401,7 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)
|
||||
|
||||
/* If there was already an IPSEC SA, we keep it as is, else
|
||||
* we go look for it ...
|
||||
*/
|
||||
*/
|
||||
#define DUMMY_MARK 0
|
||||
static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
|
||||
{
|
||||
@@ -2694,7 +2698,8 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev)
|
||||
if (!x)
|
||||
return 0;
|
||||
/* XXX: we dont support tunnel mode for now until
|
||||
* we resolve the dst issue */
|
||||
* we resolve the dst issue
|
||||
*/
|
||||
if ((x->props.mode != XFRM_MODE_TRANSPORT) && (pkt_dev->spi == 0))
|
||||
return 0;
|
||||
|
||||
@@ -3788,7 +3793,8 @@ static int add_dev_to_thread(struct pktgen_thread *t,
|
||||
* userspace on another CPU than the kthread. The if_lock()
|
||||
* is used here to sync with concurrent instances of
|
||||
* _rem_dev_from_if_list() invoked via kthread, which is also
|
||||
* updating the if_list */
|
||||
* updating the if_list
|
||||
*/
|
||||
if_lock(t);
|
||||
|
||||
if (pkt_dev->pg_thread) {
|
||||
@@ -3983,7 +3989,8 @@ static int pktgen_remove_device(struct pktgen_thread *t,
|
||||
|
||||
/* Remove proc before if_list entry, because add_device uses
|
||||
* list to determine if interface already exist, avoid race
|
||||
* with proc_create_data() */
|
||||
* with proc_create_data()
|
||||
*/
|
||||
proc_remove(pkt_dev->entry);
|
||||
|
||||
/* And update the thread if_list */
|
||||
|
||||
Reference in New Issue
Block a user