diff options
| author | chetan loke <loke.chetan@gmail.com> | 2011-08-25 10:43:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-26 12:38:44 -0400 |
| commit | bc59ba399113fcbcac56ba22edde4b816199d48c (patch) | |
| tree | 16c9023b050de412a934008b99eb8c2cf3464be1 /include/linux/if_packet.h | |
| parent | 165c68d5a291537eaf2d3821a19335c9ec100ba6 (diff) | |
| download | blackbird-op-linux-bc59ba399113fcbcac56ba22edde4b816199d48c.tar.gz blackbird-op-linux-bc59ba399113fcbcac56ba22edde4b816199d48c.zip | |
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: Chetan Loke <loke.chetan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_packet.h')
| -rw-r--r-- | include/linux/if_packet.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h index 5926d59c4295..5e76988f8ffc 100644 --- a/include/linux/if_packet.h +++ b/include/linux/if_packet.h @@ -126,7 +126,7 @@ struct tpacket2_hdr { __u16 tp_padding; }; -struct hdr_variant1 { +struct tpacket_hdr_variant1 { __u32 tp_rxhash; __u32 tp_vlan_tci; }; @@ -142,11 +142,11 @@ struct tpacket3_hdr { __u16 tp_net; /* pkt_hdr variants */ union { - struct hdr_variant1 hv1; + struct tpacket_hdr_variant1 hv1; }; }; -struct bd_ts { +struct tpacket_bd_ts { unsigned int ts_sec; union { unsigned int ts_usec; @@ -154,7 +154,7 @@ struct bd_ts { }; }; -struct hdr_v1 { +struct tpacket_hdr_v1 { __u32 block_status; __u32 num_pkts; __u32 offset_to_first_pkt; @@ -200,17 +200,17 @@ struct hdr_v1 { * 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 { - struct hdr_v1 bh1; +union tpacket_bd_header_u { + struct tpacket_hdr_v1 bh1; }; -struct block_desc { +struct tpacket_block_desc { __u32 version; __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)) |
