Update <netpacket/packet.h> for Linux 4.3.

In the course of reviewing Linux 4.3 changes for any glibc header
updates needed, I found that
sysdeps/unix/sysv/linux/netpacket/packet.h was extremely out of date
(last updated for Linux 2.3.15, it seems).  This patch updates the
sets of constants present in that header to include those added to
those sets in newer kernels (include/uapi/linux/if_packet.h).

Tested for x86_64 (testsuite, and that installed shared libraries are
unchanged by the patch).

	* sysdeps/unix/sysv/linux/netpacket/packet.h (PACKET_COPY_THRESH):
	New macro.
	(PACKET_AUXDATA): Likewise.
	(PACKET_ORIGDEV): Likewise.
	(PACKET_VERSION): Likewise.
	(PACKET_HDRLEN): Likewise.
	(PACKET_RESERVE): Likewise.
	(PACKET_TX_RING): Likewise.
	(PACKET_LOSS): Likewise.
	(PACKET_VNET_HDR): Likewise.
	(PACKET_TX_TIMESTAMP): Likewise.
	(PACKET_TIMESTAMP): Likewise.
	(PACKET_FANOUT): Likewise.
	(PACKET_TX_HAS_OFF): Likewise.
	(PACKET_QDISC_BYPASS): Likewise.
	(PACKET_ROLLOVER_STATS): Likewise.
	(PACKET_FANOUT_DATA): Likewise.
	(PACKET_MR_UNICAST): Likewise.

diff --git a/ChangeLog b/ChangeLog
index edafa679852a2561cc3420135fded8f1545bc5b9..d68226eb2ca2a8f61ba6496e52fa746397ec287e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2015-11-23  Joseph Myers  <joseph@codesourcery.com>
 
+       * sysdeps/unix/sysv/linux/netpacket/packet.h (PACKET_COPY_THRESH):
+       New macro.
+       (PACKET_AUXDATA): Likewise.
+       (PACKET_ORIGDEV): Likewise.
+       (PACKET_VERSION): Likewise.
+       (PACKET_HDRLEN): Likewise.
+       (PACKET_RESERVE): Likewise.
+       (PACKET_TX_RING): Likewise.
+       (PACKET_LOSS): Likewise.
+       (PACKET_VNET_HDR): Likewise.
+       (PACKET_TX_TIMESTAMP): Likewise.
+       (PACKET_TIMESTAMP): Likewise.
+       (PACKET_FANOUT): Likewise.
+       (PACKET_TX_HAS_OFF): Likewise.
+       (PACKET_QDISC_BYPASS): Likewise.
+       (PACKET_ROLLOVER_STATS): Likewise.
+       (PACKET_FANOUT_DATA): Likewise.
+       (PACKET_MR_UNICAST): Likewise.
+
        [BZ #19242]
        * stdlib/strtol_l.c (ISALPHA): Use _nl_C_locobj_ptr for locale.
        (TOUPPER): Likewise.

diff --git a/sysdeps/unix/sysv/linux/netpacket/packet.h b/sysdeps/unix/sysv/linux/netpacket/packet.h
index 5c2bbe791c3a65af1ec9911a2cfaab2053d41ef0..d3b7e0663f7939808869ef4a465fbb3b26c0bff2 100644 (file)
--- a/sysdeps/unix/sysv/linux/netpacket/packet.h
+++ b/sysdeps/unix/sysv/linux/netpacket/packet.h
@@ -47,6 +47,22 @@ struct sockaddr_ll
 #define        PACKET_RECV_OUTPUT              3
 #define        PACKET_RX_RING                  5
 #define        PACKET_STATISTICS               6
+#define        PACKET_COPY_THRESH              7
+#define        PACKET_AUXDATA                  8
+#define        PACKET_ORIGDEV                  9
+#define        PACKET_VERSION                  10
+#define        PACKET_HDRLEN                   11
+#define        PACKET_RESERVE                  12
+#define        PACKET_TX_RING                  13
+#define        PACKET_LOSS                     14
+#define        PACKET_VNET_HDR                 15
+#define        PACKET_TX_TIMESTAMP             16
+#define        PACKET_TIMESTAMP                17
+#define        PACKET_FANOUT                   18
+#define        PACKET_TX_HAS_OFF               19
+#define        PACKET_QDISC_BYPASS             20
+#define        PACKET_ROLLOVER_STATS           21
+#define        PACKET_FANOUT_DATA              22
 
 struct packet_mreq
   {
@@ -59,5 +75,6 @@ struct packet_mreq
 #define PACKET_MR_MULTICAST    0
 #define PACKET_MR_PROMISC      1
 #define PACKET_MR_ALLMULTI     2
+#define PACKET_MR_UNICAST      3
 
 #endif /* netpacket/packet.h */