Pull networking fixes from David Miller: 1) Off by one in netlink parsing of mac802154_hwsim, from Alexander Aring. 2) nf_tables RCU usage fix from Taehee Yoo. 3) Flow dissector needs nhoff and thoff clamping, from Stanislav Fomichev. 4) Missing sin6_flowinfo initialization in SCTP, from Xin Long. 5) Spectrev1 in ipmr and ip6mr, from Gustavo A. R. Silva. 6) Fix r8169 crash when DEBUG_SHIRQ is enabled, from Heiner Kallweit. 7) Fix SKB leak in rtlwifi, from Larry Finger. 8) Fix state pruning in bpf verifier, from Jakub Kicinski. 9) Don't handle completely duplicate fragments as overlapping, from Michal Kubecek. 10) Fix memory corruption with macb and 64-bit DMA, from Anssi Hannula. 11) Fix TCP fallback socket release in smc, from Myungho Jung. 12) gro_cells_destroy needs to napi_disable, from Lorenzo Bianconi. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (130 commits) rds: Fix warning. neighbor: NTF_PROXY is a valid ndm_flag for a dump request net: mvpp2: fix the phylink mode validation net/sched: cls_flower: Remove old entries from rhashtable net/tls: allocate tls context using GFP_ATOMIC iptunnel: make TUNNEL_FLAGS available in uapi gro_cell: add napi_disable in gro_cells_destroy lan743x: Remove MAC Reset from initialization net/mlx5e: Remove the false indication of software timestamping support net/mlx5: Typo fix in del_sw_hw_rule net/mlx5e: RX, Fix wrong early return in receive queue poll ipv6: explicitly initialize udp6_addr in udp_sock_create6() bnxt_en: Fix ethtool self-test loopback. net/rds: remove user triggered WARN_ON in rds_sendmsg net/rds: fix warn in rds_message_alloc_sgs ath10k: skip sending quiet mode cmd for WCN3990 mac80211: free skb fraglist before freeing the skb nl80211: fix memory leak if validate_pae_over_nl80211() fails net/smc: fix TCP fallback socket release vxge: ensure data0 is initialized in when fetching firmware version information ...
Showing the changes to include/uapi/linux (4 of 137 files). Show all
Unified · Split
| @@ -160,4 +160,24 @@ enum { · 159 unmodified lines | ||
| 160 | 160 | }; |
| 161 | 161 | |
| 162 | 162 | #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) |
| 163 | + | |
| 164 | +#define TUNNEL_CSUM __cpu_to_be16(0x01) | |
| 165 | +#define TUNNEL_ROUTING __cpu_to_be16(0x02) | |
| 166 | +#define TUNNEL_KEY __cpu_to_be16(0x04) | |
| 167 | +#define TUNNEL_SEQ __cpu_to_be16(0x08) | |
| 168 | +#define TUNNEL_STRICT __cpu_to_be16(0x10) | |
| 169 | +#define TUNNEL_REC __cpu_to_be16(0x20) | |
| 170 | +#define TUNNEL_VERSION __cpu_to_be16(0x40) | |
| 171 | +#define TUNNEL_NO_KEY __cpu_to_be16(0x80) | |
| 172 | +#define TUNNEL_DONT_FRAGMENT __cpu_to_be16(0x0100) | |
| 173 | +#define TUNNEL_OAM __cpu_to_be16(0x0200) | |
| 174 | +#define TUNNEL_CRIT_OPT __cpu_to_be16(0x0400) | |
| 175 | +#define TUNNEL_GENEVE_OPT __cpu_to_be16(0x0800) | |
| 176 | +#define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) | |
| 177 | +#define TUNNEL_NOCACHE __cpu_to_be16(0x2000) | |
| 178 | +#define TUNNEL_ERSPAN_OPT __cpu_to_be16(0x4000) | |
| 179 | + | |
| 180 | +#define TUNNEL_OPTIONS_PRESENT \ | |
| 181 | + (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT) | |
| 182 | + | |
| 163 | 183 | #endif /* _UAPI_IF_TUNNEL_H_ */ |
| @@ -266,10 +266,14 @@ struct sockaddr_in { · 265 unmodified lines | ||
| 266 | 266 | |
| 267 | 267 | #define IN_CLASSD(a) ((((long int) (a)) & 0xf0000000) == 0xe0000000) |
| 268 | 268 | #define IN_MULTICAST(a) IN_CLASSD(a) |
| 269 | −#define IN_MULTICAST_NET 0xF0000000 | |
| 269 | +#define IN_MULTICAST_NET 0xe0000000 | |
| 270 | 270 | |
| 271 | −#define IN_EXPERIMENTAL(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000) | |
| 272 | −#define IN_BADCLASS(a) IN_EXPERIMENTAL((a)) | |
| 271 | +#define IN_BADCLASS(a) ((((long int) (a) ) == 0xffffffff) | |
| 272 | +#define IN_EXPERIMENTAL(a) IN_BADCLASS((a)) | |
| 273 | + | |
| 274 | +#define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000) | |
| 275 | +#define IN_CLASSE_NET 0xffffffff | |
| 276 | +#define IN_CLASSE_NSHIFT 0 | |
| 273 | 277 | |
| 274 | 278 | /* Address to accept any incoming messages. */ |
| 275 | 279 | #define INADDR_ANY ((unsigned long int) 0x00000000) |
| @@ -155,8 +155,8 @@ enum txtime_flags { · 154 unmodified lines | ||
| 155 | 155 | }; |
| 156 | 156 | |
| 157 | 157 | struct sock_txtime { |
| 158 | − clockid_t clockid; /* reference clockid */ | |
| 159 | − __u32 flags; /* as defined by enum txtime_flags */ | |
| 158 | + __kernel_clockid_t clockid;/* reference clockid */ | |
| 159 | + __u32 flags; /* as defined by enum txtime_flags */ | |
| 160 | 160 | }; |
| 161 | 161 | |
| 162 | 162 | #endif /* _NET_TIMESTAMPING_H */ |
| @@ -155,7 +155,7 @@ enum nlmsgerr_attrs { · 154 unmodified lines | ||
| 155 | 155 | #define NETLINK_LIST_MEMBERSHIPS 9 |
| 156 | 156 | #define NETLINK_CAP_ACK 10 |
| 157 | 157 | #define NETLINK_EXT_ACK 11 |
| 158 | −#define NETLINK_DUMP_STRICT_CHK 12 | |
| 158 | +#define NETLINK_GET_STRICT_CHK 12 | |
| 159 | 159 | |
| 160 | 160 | struct nl_pktinfo { |
| 161 | 161 | __u32 group; |