Commit bc59ba39 authored by chetan loke's avatar chetan loke Committed by David S. Miller

af_packet: Prefixed tpacket_v3 structs to avoid name space collision

structs introduced in tpacket_v3 implementation are prefixed with 'tpacket'
to avoid namespace collision.

Compile tested.
Signed-off-by: default avatarChetan Loke <loke.chetan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 165c68d5
...@@ -126,7 +126,7 @@ struct tpacket2_hdr { ...@@ -126,7 +126,7 @@ struct tpacket2_hdr {
__u16 tp_padding; __u16 tp_padding;
}; };
struct hdr_variant1 { struct tpacket_hdr_variant1 {
__u32 tp_rxhash; __u32 tp_rxhash;
__u32 tp_vlan_tci; __u32 tp_vlan_tci;
}; };
...@@ -142,11 +142,11 @@ struct tpacket3_hdr { ...@@ -142,11 +142,11 @@ struct tpacket3_hdr {
__u16 tp_net; __u16 tp_net;
/* pkt_hdr variants */ /* pkt_hdr variants */
union { union {
struct hdr_variant1 hv1; struct tpacket_hdr_variant1 hv1;
}; };
}; };
struct bd_ts { struct tpacket_bd_ts {
unsigned int ts_sec; unsigned int ts_sec;
union { union {
unsigned int ts_usec; unsigned int ts_usec;
...@@ -154,7 +154,7 @@ struct bd_ts { ...@@ -154,7 +154,7 @@ struct bd_ts {
}; };
}; };
struct hdr_v1 { struct tpacket_hdr_v1 {
__u32 block_status; __u32 block_status;
__u32 num_pkts; __u32 num_pkts;
__u32 offset_to_first_pkt; __u32 offset_to_first_pkt;
...@@ -200,17 +200,17 @@ struct hdr_v1 { ...@@ -200,17 +200,17 @@ struct hdr_v1 {
* Use the ts of the first packet in the block. * Use the ts of the first packet in the block.
* *
*/ */
struct bd_ts ts_first_pkt, ts_last_pkt; struct tpacket_bd_ts ts_first_pkt, ts_last_pkt;
}; };
union bd_header_u { union tpacket_bd_header_u {
struct hdr_v1 bh1; struct tpacket_hdr_v1 bh1;
}; };
struct block_desc { struct tpacket_block_desc {
__u32 version; __u32 version;
__u32 offset_to_priv; __u32 offset_to_priv;
union bd_header_u hdr; union tpacket_bd_header_u hdr;
}; };
#define TPACKET2_HDRLEN (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll)) #define TPACKET2_HDRLEN (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment