Pull networking fixes from David Miller: 1) mlx4 driver bug fixes (TX queue wakeups, csum complete indications) from Ido Shamay, Eran Ben Elisha, and Or Gerlitz. 2) Missing unlock in error path of PTP support in renesas driver, from Dan Carpenter. 3) Add Vitesse 8641 phy IDs to vitesse PHY driver, from Shaohui Xie. 4) Bnx2x driver bug fixes (linearization of encap packets, scratchpad parity error notifications, flow-control and speed settings) from Yuval Mintz, Manish Chopra, Shahed Shaikh, and Ariel Elior. 5) ipv6 extension header parsing in the igb chip has a HW errata, disable it. Frm Todd Fujinaka. 6) Fix PCI link state locking issue in e1000e driver, from Yanir Lubetkin. 7) Cure panics during MTU change in i40e, from Mitch Williams. 8) Don't leak promisc refs in DSA slave driver, from Gilad Ben-Yossef. 9) Add missing HAS_DMA dep to VIA Rhine driver, from Geery Uytterhoeven. 10) Make sure DMA map/unmap calls are symmetric in bnx2x driver, from Michal Schmidt. 11) Workaround for MDIO access problems in bcm7xxx devices, from FLorian Fainelli. 12) Fix races in SCTP protocol between OTTB responses and route removals, from Alexander Sverdlin. 13) Fix jumbo frame checksum issue with some mvneta devices, from Simon Guinot. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (58 commits) sock_diag: don't broadcast kernel sockets net: mvneta: disable IP checksum with jumbo frames for Armada 370 ARM: mvebu: update Ethernet compatible string for Armada XP net: mvneta: introduce compatible string "marvell, armada-xp-neta" api: fix compatibility of linux/in.h with netinet/in.h net: icplus: fix typo in constant name sis900: Trivial: Fix typos in enums stmmac: Trivial: fix typo in constant name sctp: Fix race between OOTB responce and route removal net-Liquidio: Delete unnecessary checks before the function call "vfree" vmxnet3: Bump up driver version number amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation net: phy: mdio-bcm-unimac: workaround initial read failures for integrated PHYs net: bcmgenet: workaround initial read failures for integrated PHYs net: phy: bcm7xxx: workaround MDIO management controller initial read bnx2x: fix DMA API usage net: via: VIA_RHINE and VIA_VELOCITY should depend on HAS_DMA net/phy: tune get_phy_c45_ids to support more c45 phy bnx2x: fix lockdep splat net: fec: don't access RACC register when not available ...
Showing the changes to include/uapi (2 of 69 files). Show all
Unified · Split
| @@ -19,8 +19,10 @@ · 18 unmodified lines | ||
| 19 | 19 | #define _UAPI_LINUX_IN_H |
| 20 | 20 | |
| 21 | 21 | #include <linux/types.h> |
| 22 | +#include <linux/libc-compat.h> | |
| 22 | 23 | #include <linux/socket.h> |
| 23 | 24 | |
| 25 | +#if __UAPI_DEF_IN_IPPROTO | |
| 24 | 26 | /* Standard well-defined IP protocols. */ |
| 25 | 27 | enum { |
| 26 | 28 | IPPROTO_IP = 0, /* Dummy protocol for TCP */ |
| @@ -75,12 +77,14 @@ enum { · 48 unmodified lines | ||
| 75 | 77 | #define IPPROTO_RAW IPPROTO_RAW |
| 76 | 78 | IPPROTO_MAX |
| 77 | 79 | }; |
| 80 | +#endif | |
| 78 | 81 | |
| 79 | − | |
| 82 | +#if __UAPI_DEF_IN_ADDR | |
| 80 | 83 | /* Internet address. */ |
| 81 | 84 | struct in_addr { |
| 82 | 85 | __be32 s_addr; |
| 83 | 86 | }; |
| 87 | +#endif | |
| 84 | 88 | |
| 85 | 89 | #define IP_TOS 1 |
| 86 | 90 | #define IP_TTL 2 |
| @@ -158,6 +162,7 @@ struct in_addr { · 71 unmodified lines | ||
| 158 | 162 | |
| 159 | 163 | /* Request struct for multicast socket ops */ |
| 160 | 164 | |
| 165 | +#if __UAPI_DEF_IP_MREQ | |
| 161 | 166 | struct ip_mreq { |
| 162 | 167 | struct in_addr imr_multiaddr; /* IP multicast address of group */ |
| 163 | 168 | struct in_addr imr_interface; /* local IP address of interface */ |
| @@ -209,14 +214,18 @@ struct group_filter { · 45 unmodified lines | ||
| 209 | 214 | #define GROUP_FILTER_SIZE(numsrc) \ |
| 210 | 215 | (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \ |
| 211 | 216 | + (numsrc) * sizeof(struct __kernel_sockaddr_storage)) |
| 217 | +#endif | |
| 212 | 218 | |
| 219 | +#if __UAPI_DEF_IN_PKTINFO | |
| 213 | 220 | struct in_pktinfo { |
| 214 | 221 | int ipi_ifindex; |
| 215 | 222 | struct in_addr ipi_spec_dst; |
| 216 | 223 | struct in_addr ipi_addr; |
| 217 | 224 | }; |
| 225 | +#endif | |
| 218 | 226 | |
| 219 | 227 | /* Structure describing an Internet (IP) socket address. */ |
| 228 | +#if __UAPI_DEF_SOCKADDR_IN | |
| 220 | 229 | #define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */ |
| 221 | 230 | struct sockaddr_in { |
| 222 | 231 | __kernel_sa_family_t sin_family; /* Address family */ |
| @@ -228,8 +237,9 @@ struct sockaddr_in { · 5 unmodified lines | ||
| 228 | 237 | sizeof(unsigned short int) - sizeof(struct in_addr)]; |
| 229 | 238 | }; |
| 230 | 239 | #define sin_zero __pad /* for BSD UNIX comp. -FvK */ |
| 240 | +#endif | |
| 231 | 241 | |
| 232 | − | |
| 242 | +#if __UAPI_DEF_IN_CLASS | |
| 233 | 243 | /* |
| 234 | 244 | * Definitions of the bits in an Internet address integer. |
| 235 | 245 | * On subnets, host and network parts are found according |
| @@ -280,7 +290,7 @@ struct sockaddr_in { · 44 unmodified lines | ||
| 280 | 290 | #define INADDR_ALLHOSTS_GROUP 0xe0000001U /* 224.0.0.1 */ |
| 281 | 291 | #define INADDR_ALLRTRS_GROUP 0xe0000002U /* 224.0.0.2 */ |
| 282 | 292 | #define INADDR_MAX_LOCAL_GROUP 0xe00000ffU /* 224.0.0.255 */ |
| 283 | − | |
| 293 | +#endif | |
| 284 | 294 | |
| 285 | 295 | /* <asm/byteorder.h> contains the htonl type stuff.. */ |
| 286 | 296 | #include <asm/byteorder.h> |
| @@ -56,6 +56,13 @@ · 55 unmodified lines | ||
| 56 | 56 | |
| 57 | 57 | /* GLIBC headers included first so don't define anything |
| 58 | 58 | * that would already be defined. */ |
| 59 | +#define __UAPI_DEF_IN_ADDR 0 | |
| 60 | +#define __UAPI_DEF_IN_IPPROTO 0 | |
| 61 | +#define __UAPI_DEF_IN_PKTINFO 0 | |
| 62 | +#define __UAPI_DEF_IP_MREQ 0 | |
| 63 | +#define __UAPI_DEF_SOCKADDR_IN 0 | |
| 64 | +#define __UAPI_DEF_IN_CLASS 0 | |
| 65 | + | |
| 59 | 66 | #define __UAPI_DEF_IN6_ADDR 0 |
| 60 | 67 | /* The exception is the in6_addr macros which must be defined |
| 61 | 68 | * if the glibc code didn't define them. This guard matches |
| @@ -78,6 +85,13 @@ · 16 unmodified lines | ||
| 78 | 85 | /* Linux headers included first, and we must define everything |
| 79 | 86 | * we need. The expectation is that glibc will check the |
| 80 | 87 | * __UAPI_DEF_* defines and adjust appropriately. */ |
| 88 | +#define __UAPI_DEF_IN_ADDR 1 | |
| 89 | +#define __UAPI_DEF_IN_IPPROTO 1 | |
| 90 | +#define __UAPI_DEF_IN_PKTINFO 1 | |
| 91 | +#define __UAPI_DEF_IP_MREQ 1 | |
| 92 | +#define __UAPI_DEF_SOCKADDR_IN 1 | |
| 93 | +#define __UAPI_DEF_IN_CLASS 1 | |
| 94 | + | |
| 81 | 95 | #define __UAPI_DEF_IN6_ADDR 1 |
| 82 | 96 | /* We unconditionally define the in6_addr macros and glibc must |
| 83 | 97 | * coordinate. */ |
| @@ -103,6 +117,14 @@ · 19 unmodified lines | ||
| 103 | 117 | * that we need. */ |
| 104 | 118 | #else /* !defined(__GLIBC__) */ |
| 105 | 119 | |
| 120 | +/* Definitions for in.h */ | |
| 121 | +#define __UAPI_DEF_IN_ADDR 1 | |
| 122 | +#define __UAPI_DEF_IN_IPPROTO 1 | |
| 123 | +#define __UAPI_DEF_IN_PKTINFO 1 | |
| 124 | +#define __UAPI_DEF_IP_MREQ 1 | |
| 125 | +#define __UAPI_DEF_SOCKADDR_IN 1 | |
| 126 | +#define __UAPI_DEF_IN_CLASS 1 | |
| 127 | + | |
| 106 | 128 | /* Definitions for in6.h */ |
| 107 | 129 | #define __UAPI_DEF_IN6_ADDR 1 |
| 108 | 130 | #define __UAPI_DEF_IN6_ADDR_ALT 1 |